adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming SeedRandom to TFB_SeedRandom, for consistancy.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@465 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2002-12-22 18:07:54 +00:00
parent caca450519
commit caac6b75f4
27 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/battle.c
+2 -2
View File
@@ -174,11 +174,11 @@ Battle (void)
SetResourceIndex (hResIndex);
#if !(DEMO_MODE || CREATE_JOURNAL)
SeedRandom (GetTimeCounter ());
TFB_SeedRandom (GetTimeCounter ());
#else /* DEMO_MODE */
if (BattleSeed == 0)
BattleSeed = TFB_Random ();
SeedRandom (BattleSeed);
TFB_SeedRandom (BattleSeed);
BattleSeed = TFB_Random (); /* get next battle seed */
#endif /* DEMO_MODE */
sc2/src/sc2code/demo.c
+1 -1
View File
@@ -103,7 +103,7 @@ OpenJournal (void)
FlushInput ();
cread ((PBYTE)&start_seed, sizeof (start_seed), 1, journal_fh);
SeedRandom (start_seed);
TFB_SeedRandom (start_seed);
}
}
}
sc2/src/sc2code/libs/math/fastrand.c
+1 -1
View File
@@ -48,7 +48,7 @@ seed_fast_random(DWORD seed)
DWORD retval;
COUNT index;
retval = SeedRandom(seed);
retval = TFB_SeedRandom(seed);
for( index = 0; index < TABLE_SIZE; index++ )
random_table[index] = TFB_Random();
sc2/src/sc2code/libs/math/random.c
+2 -2
View File
@@ -70,7 +70,7 @@ TFB_Random (void)
}
/*****************************************************************************
* FUNC: DWORD SeedRandom(DWORD l)
* FUNC: DWORD TFB_SeedRandom(DWORD l)
*
* DESC: set the seed for the random number generator to parameter "l", and
* return the value of the previously active seed, to allow for multiple
@@ -83,7 +83,7 @@ TFB_Random (void)
*****************************************************************************/
DWORD
SeedRandom (DWORD new_seed)
TFB_SeedRandom (DWORD new_seed)
{
DWORD old_seed;
sc2/src/sc2code/libs/mathlib.h
+1 -1
View File
@@ -21,7 +21,7 @@
#include "compiler.h"
extern DWORD SeedRandom (DWORD seed);
extern DWORD TFB_SeedRandom (DWORD seed);
extern DWORD TFB_Random (void);
extern COUNT square_root (DWORD value);
sc2/src/sc2code/planets/calc.c
+2 -2
View File
@@ -227,7 +227,7 @@ DoPlanetaryAnalysis (SYSTEM_INFOPTR SysInfoPtr, PPLANET_DESC
if (pPlanetDesc->data_index == (BYTE)~0)
return (0);
old_seed = SeedRandom (pPlanetDesc->rand_seed);
old_seed = TFB_SeedRandom (pPlanetDesc->rand_seed);
CalcSysInfo (SysInfoPtr);
@@ -394,6 +394,6 @@ DoPlanetaryAnalysis (SYSTEM_INFOPTR SysInfoPtr, PPLANET_DESC
#endif /* DEBUG */
}
return (SeedRandom (old_seed));
return (TFB_SeedRandom (old_seed));
}
sc2/src/sc2code/planets/genburv.c
+4 -4
View File
@@ -34,7 +34,7 @@ GenerateBurvixes (BYTE control)
{
COUNT which_node;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -56,14 +56,14 @@ GenerateBurvixes (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
else if (pSolarSysState->pOrbitalDesc->pPrevDesc == &pSolarSysState->PlanetDesc[0]
&& pSolarSysState->pOrbitalDesc == &pSolarSysState->MoonDesc[0]
&& !GET_GAME_STATE (BURVIXESE_BROADCASTERS))
{
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -89,7 +89,7 @@ GenerateBurvixes (BYTE control)
}
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/gendru.c
+2 -2
View File
@@ -30,7 +30,7 @@ GenerateDruuge (BYTE control)
COUNT i, which_node;
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -69,7 +69,7 @@ GenerateDruuge (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genilw.c
+2 -2
View File
@@ -29,7 +29,7 @@ GenerateIlwrath (BYTE control)
COUNT i, which_node;
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -51,7 +51,7 @@ GenerateIlwrath (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genmyc.c
+2 -2
View File
@@ -32,7 +32,7 @@ GenerateMycon (BYTE control)
{
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -90,7 +90,7 @@ GenerateMycon (BYTE control)
}
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genorz.c
+6 -6
View File
@@ -32,7 +32,7 @@ GenerateAndrosynth (BYTE control)
{
COUNT i, which_node;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -95,7 +95,7 @@ GenerateAndrosynth (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
@@ -197,7 +197,7 @@ GenerateOrz (BYTE control)
&& pSolarSysState->pOrbitalDesc == &pSolarSysState->MoonDesc[2]
&& !GET_GAME_STATE (TAALO_PROTECTOR))
{
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -223,7 +223,7 @@ GenerateOrz (BYTE control)
}
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
else if (CurStarDescPtr->Index == ORZ_DEFINED
@@ -231,7 +231,7 @@ GenerateOrz (BYTE control)
{
COUNT i, which_node;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -253,7 +253,7 @@ GenerateOrz (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genpet.c
+2 -2
View File
@@ -112,7 +112,7 @@ GenerateTalkingPet (BYTE control)
COUNT i, which_node;
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -134,7 +134,7 @@ GenerateTalkingPet (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genpku.c
+2 -2
View File
@@ -30,7 +30,7 @@ GeneratePkunk (BYTE control)
COUNT i, which_node;
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -69,7 +69,7 @@ GeneratePkunk (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/gensol.c
+3 -3
View File
@@ -135,7 +135,7 @@ generate_tractors (void)
COUNT i, which_node;
DWORD old_rand, rand_val;
old_rand = SeedRandom (pSolarSysState->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
old_rand = TFB_SeedRandom (pSolarSysState->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
which_node = i = 0;
do
@@ -154,7 +154,7 @@ generate_tractors (void)
} while (++i < 10);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
}
}
@@ -491,7 +491,7 @@ GenerateSOL (BYTE control)
case GENERATE_PLANETS:
{
#define SOL_SEED 334241042L
SeedRandom (SOL_SEED);
TFB_SeedRandom (SOL_SEED);
pSolarSysState->SunDesc[0].NumPlanets = 9;
for (i = 0, pCurDesc = pSolarSysState->PlanetDesc; i < 9; ++i, ++pCurDesc)
sc2/src/sc2code/planets/genspa.c
+4 -4
View File
@@ -33,7 +33,7 @@ GenerateSpathi (BYTE control)
{
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -59,7 +59,7 @@ GenerateSpathi (BYTE control)
}
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
@@ -108,7 +108,7 @@ GenerateSpathi (BYTE control)
COUNT which_node;
DWORD old_rand;
old_rand = SeedRandom (pSolarSysState->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
old_rand = TFB_SeedRandom (pSolarSysState->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
which_node = i = 0;
do
@@ -134,7 +134,7 @@ GenerateSpathi (BYTE control)
SET_GAME_STATE (SPATHI_CREATURES_ELIMINATED, 1);
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/gensup.c
+2 -2
View File
@@ -30,7 +30,7 @@ GenerateSupox (BYTE control)
COUNT i, which_node;
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -68,7 +68,7 @@ GenerateSupox (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genthrad.c
+4 -4
View File
@@ -32,7 +32,7 @@ GenerateThradd (BYTE control)
{
COUNT i, which_node;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -54,12 +54,12 @@ GenerateThradd (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
else if (!GET_GAME_STATE (AQUA_HELIX))
{
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -87,7 +87,7 @@ GenerateThradd (BYTE control)
}
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
}
sc2/src/sc2code/planets/genutw.c
+4 -4
View File
@@ -60,7 +60,7 @@ GenerateUtwig (BYTE control)
{
COUNT i, which_node;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -82,7 +82,7 @@ GenerateUtwig (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
else if (CurStarDescPtr->Index == BOMB_DEFINED
@@ -90,7 +90,7 @@ GenerateUtwig (BYTE control)
&& pSolarSysState->pOrbitalDesc == &pSolarSysState->MoonDesc[1]
&& !GET_GAME_STATE (UTWIG_BOMB))
{
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -119,7 +119,7 @@ GenerateUtwig (BYTE control)
}
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genvault.c
+2 -2
View File
@@ -30,7 +30,7 @@ GenerateShipVault (BYTE control)
{
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -65,7 +65,7 @@ GenerateShipVault (BYTE control)
}
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genvux.c
+6 -6
View File
@@ -59,7 +59,7 @@ GenerateVUX (BYTE control)
COUNT i, which_node;
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -81,7 +81,7 @@ GenerateVUX (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
}
@@ -252,7 +252,7 @@ GenerateVUX (BYTE control)
COUNT i;
DWORD old_rand;
old_rand = SeedRandom (pSolarSysState->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
old_rand = TFB_SeedRandom (pSolarSysState->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
i = 0;
do
@@ -275,7 +275,7 @@ GenerateVUX (BYTE control)
} while (++i < 12);
pSolarSysState->CurNode = i;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
else if (CurStarDescPtr->Index == VUX_BEAST_DEFINED
@@ -284,7 +284,7 @@ GenerateVUX (BYTE control)
COUNT i;
DWORD old_rand;
old_rand = SeedRandom (pSolarSysState->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
old_rand = TFB_SeedRandom (pSolarSysState->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
i = 0;
do
@@ -325,7 +325,7 @@ GenerateVUX (BYTE control)
} while (++i < 11);
pSolarSysState->CurNode = i;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
default:
sc2/src/sc2code/planets/genwreck.c
+2 -2
View File
@@ -29,7 +29,7 @@ GenerateUrquanWreck (BYTE control)
{
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -59,7 +59,7 @@ GenerateUrquanWreck (BYTE control)
}
}
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genyeh.c
+2 -2
View File
@@ -29,7 +29,7 @@ GenerateYehat (BYTE control)
COUNT i, which_node;
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -51,7 +51,7 @@ GenerateYehat (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/genzoq.c
+2 -2
View File
@@ -115,7 +115,7 @@ GenerateZoqFotPik (BYTE control)
COUNT i, which_node;
DWORD rand_val, old_rand;
old_rand = SeedRandom (
old_rand = TFB_SeedRandom (
pSolarSysState->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]
);
@@ -137,7 +137,7 @@ GenerateZoqFotPik (BYTE control)
} while (++i < 16);
pSolarSysState->CurNode = which_node;
SeedRandom (old_rand);
TFB_SeedRandom (old_rand);
break;
}
pSolarSysState->CurNode = 0;
sc2/src/sc2code/planets/plangen.c
+2 -2
View File
@@ -1170,7 +1170,7 @@ GeneratePlanetMask (PPLANET_DESC pPlanetDesc, BOOLEAN IsEarth)
POINT loc;
CONTEXT OldContext;
old_seed = SeedRandom (pPlanetDesc->rand_seed);
old_seed = TFB_SeedRandom (pPlanetDesc->rand_seed);
OldContext = SetContext (TaskContext);
pSolarSysState->isPFADefined = (BYTE *)HCalloc (sizeof(BYTE) * 255);
@@ -1323,7 +1323,7 @@ GeneratePlanetMask (PPLANET_DESC pPlanetDesc, BOOLEAN IsEarth)
SetContext (OldContext);
SeedRandom (old_seed);
TFB_SeedRandom (old_seed);
SetPlanetMusic ((UBYTE)(pPlanetDesc->data_index & ~PLANET_SHIELDED));
}
sc2/src/sc2code/planets/solarsys.c
+6 -6
View File
@@ -65,7 +65,7 @@ GenerateMoons (void)
- (SIS_SCREEN_HEIGHT >> 1))
* MAX_ZOOM_RADIUS / (DISPLAY_FACTOR >> 1));
pCurDesc = pSolarSysState->pBaseDesc;
old_seed = SeedRandom (pCurDesc->rand_seed);
old_seed = TFB_SeedRandom (pCurDesc->rand_seed);
(*pSolarSysState->GenFunc) (GENERATE_NAME);
(*pSolarSysState->GenFunc) (GENERATE_MOONS);
@@ -105,7 +105,7 @@ GenerateMoons (void)
}
pSolarSysState->pBaseDesc = pSolarSysState->MoonDesc;
SeedRandom (old_seed);
TFB_SeedRandom (old_seed);
}
void
@@ -180,7 +180,7 @@ LoadSolarSys (void)
// LoadIPData ();
}
old_seed = SeedRandom (
old_seed = TFB_SeedRandom (
MAKE_DWORD (CurStarDescPtr->star_pt.x,
CurStarDescPtr->star_pt.y)
);
@@ -324,7 +324,7 @@ LoadSolarSys (void)
SetAbsFrameIndex (SISIPFrame, i - 1);
}
SeedRandom (old_seed);
TFB_SeedRandom (old_seed);
}
static void
@@ -1768,7 +1768,7 @@ DrawStarBackGround (BOOLEAN ForPlanet)
ClearDrawable ();
old_seed = SeedRandom (
old_seed = TFB_SeedRandom (
MAKE_DWORD (CurStarDescPtr->star_pt.x,
CurStarDescPtr->star_pt.y)
);
@@ -1851,7 +1851,7 @@ DrawStarBackGround (BOOLEAN ForPlanet)
UnbatchGraphics ();
}
SeedRandom (old_seed);
TFB_SeedRandom (old_seed);
}
void
sc2/src/sc2code/planets/surface.c
+4 -4
View File
@@ -96,9 +96,9 @@ GenerateMineralDeposits (SYSTEM_INFOPTR SysInfoPtr, PCOUNT
{
DWORD old_rand;
old_rand = SeedRandom (SysInfoPtr->PlanetInfo.ScanSeed[MINERAL_SCAN]);
old_rand = TFB_SeedRandom (SysInfoPtr->PlanetInfo.ScanSeed[MINERAL_SCAN]);
*pwhich_deposit = CalcMineralDeposits (SysInfoPtr, *pwhich_deposit);
return (SeedRandom (old_rand));
return (TFB_SeedRandom (old_rand));
}
static COUNT
@@ -250,9 +250,9 @@ GenerateLifeForms (SYSTEM_INFOPTR SysInfoPtr, PCOUNT pwhich_life)
{
DWORD old_rand;
old_rand = SeedRandom (SysInfoPtr->PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
old_rand = TFB_SeedRandom (SysInfoPtr->PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]);
*pwhich_life = CalcLifeForms (SysInfoPtr, *pwhich_life);
return (SeedRandom (old_rand));
return (TFB_SeedRandom (old_rand));
}
sc2/src/sc2code/utils.c
+1 -1
View File
@@ -98,7 +98,7 @@ SeedRandomNumbers (void)
{
DWORD cur_time;
SeedRandom (cur_time = GetTimeCounter ());
TFB_SeedRandom (cur_time = GetTimeCounter ());
return (cur_time);
}