diff --git a/sc2/src/uqm/planets/generate/genand.c b/sc2/src/uqm/planets/generate/genand.c index 9f8e483d4..279d268f2 100644 --- a/sc2/src/uqm/planets/generate/genand.c +++ b/sc2/src/uqm/planets/generate/genand.c @@ -125,14 +125,11 @@ GenerateAndrosynth_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 1, MATCH_PLANET)) { COUNT i; - COUNT nodeI; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -167,11 +164,10 @@ GenerateAndrosynth_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, } } - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/genburv.c b/sc2/src/uqm/planets/generate/genburv.c index c6cd78dd9..efc8a32c9 100644 --- a/sc2/src/uqm/planets/generate/genburv.c +++ b/sc2/src/uqm/planets/generate/genburv.c @@ -143,15 +143,12 @@ GenerateBurvixese_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 0, MATCH_PLANET)) { - COUNT nodeI; COUNT i; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -160,11 +157,10 @@ GenerateBurvixese_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/gendru.c b/sc2/src/uqm/planets/generate/gendru.c index f81a30bf7..cd5e02751 100644 --- a/sc2/src/uqm/planets/generate/gendru.c +++ b/sc2/src/uqm/planets/generate/gendru.c @@ -131,16 +131,13 @@ GenerateDruuge_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; DWORD rand_val; DWORD old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -166,11 +163,10 @@ GenerateDruuge_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, SET_GAME_STATE (ROSY_SPHERE_ON_SHIP, 1); } } - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); diff --git a/sc2/src/uqm/planets/generate/genilw.c b/sc2/src/uqm/planets/generate/genilw.c index 0f0d7f105..21b219d7b 100644 --- a/sc2/src/uqm/planets/generate/genilw.c +++ b/sc2/src/uqm/planets/generate/genilw.c @@ -124,16 +124,13 @@ GenerateIlwrath_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; DWORD rand_val; DWORD old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -142,11 +139,10 @@ GenerateIlwrath_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/genorz.c b/sc2/src/uqm/planets/generate/genorz.c index 5a8a4b08b..4bca7dea2 100644 --- a/sc2/src/uqm/planets/generate/genorz.c +++ b/sc2/src/uqm/planets/generate/genorz.c @@ -207,14 +207,11 @@ GenerateOrz_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, && matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -223,11 +220,10 @@ GenerateOrz_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/genpet.c b/sc2/src/uqm/planets/generate/genpet.c index ba6bbf09d..7cef09631 100644 --- a/sc2/src/uqm/planets/generate/genpet.c +++ b/sc2/src/uqm/planets/generate/genpet.c @@ -161,16 +161,13 @@ GenerateTalkingPet_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; DWORD rand_val; COUNT old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -179,11 +176,10 @@ GenerateTalkingPet_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/genpku.c b/sc2/src/uqm/planets/generate/genpku.c index 58755fe56..6cf2da875 100644 --- a/sc2/src/uqm/planets/generate/genpku.c +++ b/sc2/src/uqm/planets/generate/genpku.c @@ -121,16 +121,13 @@ GeneratePkunk_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; DWORD rand_val; DWORD old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -156,11 +153,10 @@ GeneratePkunk_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, SET_GAME_STATE (CLEAR_SPINDLE_ON_SHIP, 1); } } - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/gensol.c b/sc2/src/uqm/planets/generate/gensol.c index bb84381c9..892f02bec 100644 --- a/sc2/src/uqm/planets/generate/gensol.c +++ b/sc2/src/uqm/planets/generate/gensol.c @@ -576,16 +576,13 @@ GenerateSol_generateLife (SOLARSYS_STATE *solarSys, PLANET_DESC *world, else /* Earth Moon */ { COUNT i; - COUNT nodeI; DWORD old_rand; DWORD rand_val; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 10; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -593,11 +590,10 @@ GenerateSol_generateLife (SOLARSYS_STATE *solarSys, PLANET_DESC *world, solarSys->SysInfo.PlanetInfo.CurPt.y = (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = NUM_CREATURE_TYPES + 1; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 10); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); } diff --git a/sc2/src/uqm/planets/generate/genspa.c b/sc2/src/uqm/planets/generate/genspa.c index 9ef572cdb..b6b11d09b 100644 --- a/sc2/src/uqm/planets/generate/genspa.c +++ b/sc2/src/uqm/planets/generate/genspa.c @@ -242,15 +242,12 @@ GenerateSpathi_generateLife (SOLARSYS_STATE *solarSys, PLANET_DESC *world, && !GET_GAME_STATE (SPATHI_SHIELDED_SELVES)) { COUNT i; - COUNT nodeI; DWORD old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 32; ++i) { DWORD rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -258,11 +255,10 @@ GenerateSpathi_generateLife (SOLARSYS_STATE *solarSys, PLANET_DESC *world, solarSys->SysInfo.PlanetInfo.CurPt.y = (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = NUM_CREATURE_TYPES; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 32); - *whichNode = nodeI; + } + *whichNode = i; if (solarSys->SysInfo.PlanetInfo.ScanRetrieveMask[BIOLOGICAL_SCAN]) { diff --git a/sc2/src/uqm/planets/generate/gensup.c b/sc2/src/uqm/planets/generate/gensup.c index f8ab0ef91..31a77804f 100644 --- a/sc2/src/uqm/planets/generate/gensup.c +++ b/sc2/src/uqm/planets/generate/gensup.c @@ -124,16 +124,13 @@ GenerateSupox_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; DWORD rand_val; DWORD old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -158,11 +155,10 @@ GenerateSupox_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, SET_GAME_STATE (ULTRON_CONDITION, 1); } } - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/genthrad.c b/sc2/src/uqm/planets/generate/genthrad.c index d1e81dcac..402202dfe 100644 --- a/sc2/src/uqm/planets/generate/genthrad.c +++ b/sc2/src/uqm/planets/generate/genthrad.c @@ -165,14 +165,11 @@ GenerateThraddash_generateEnergy (SOLARSYS_STATE *solarSys, if (CurStarDescPtr->Index != AQUA_HELIX_DEFINED) { COUNT i; - COUNT nodeI; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -181,11 +178,10 @@ GenerateThraddash_generateEnergy (SOLARSYS_STATE *solarSys, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/genutw.c b/sc2/src/uqm/planets/generate/genutw.c index 35e7f89bf..f5e8db2ab 100644 --- a/sc2/src/uqm/planets/generate/genutw.c +++ b/sc2/src/uqm/planets/generate/genutw.c @@ -215,14 +215,11 @@ GenerateUtwig_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, && matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -231,11 +228,10 @@ GenerateUtwig_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/genvux.c b/sc2/src/uqm/planets/generate/genvux.c index ae779ac3a..ccc041a47 100644 --- a/sc2/src/uqm/planets/generate/genvux.c +++ b/sc2/src/uqm/planets/generate/genvux.c @@ -238,16 +238,13 @@ GenerateVux_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (CurStarDescPtr->Index == VUX_DEFINED) { COUNT i; - COUNT nodeI; DWORD rand_val; DWORD old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -256,11 +253,10 @@ GenerateVux_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; @@ -284,8 +280,7 @@ GenerateVux_generateLife (SOLARSYS_STATE *solarSys, PLANET_DESC *world, old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]); - i = 0; - do + for (i = 0; i < 12; ++i) { DWORD rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -300,7 +295,7 @@ GenerateVux_generateLife (SOLARSYS_STATE *solarSys, PLANET_DESC *world, solarSys->SysInfo.PlanetInfo.CurType = 18; if (i >= *whichNode) break; - } while (++i < 12); + } *whichNode = i; TFB_SeedRandom (old_rand); @@ -316,8 +311,7 @@ GenerateVux_generateLife (SOLARSYS_STATE *solarSys, PLANET_DESC *world, old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[BIOLOGICAL_SCAN]); - i = 0; - do + for (i = 0; i < 11; ++i) { DWORD rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -347,7 +341,7 @@ GenerateVux_generateLife (SOLARSYS_STATE *solarSys, PLANET_DESC *world, } if (i >= *whichNode) break; - } while (++i < 11); + } *whichNode = i; TFB_SeedRandom (old_rand); diff --git a/sc2/src/uqm/planets/generate/genyeh.c b/sc2/src/uqm/planets/generate/genyeh.c index 3129d86b2..ee8005a62 100644 --- a/sc2/src/uqm/planets/generate/genyeh.c +++ b/sc2/src/uqm/planets/generate/genyeh.c @@ -114,16 +114,13 @@ GenerateYehat_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; DWORD rand_val; DWORD old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -132,11 +129,10 @@ GenerateYehat_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true; diff --git a/sc2/src/uqm/planets/generate/genzoq.c b/sc2/src/uqm/planets/generate/genzoq.c index fa7936573..f7a5ad97a 100644 --- a/sc2/src/uqm/planets/generate/genzoq.c +++ b/sc2/src/uqm/planets/generate/genzoq.c @@ -144,16 +144,13 @@ GenerateZoqFotPik_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, if (matchWorld (solarSys, world, 0, MATCH_PLANET)) { COUNT i; - COUNT nodeI; DWORD rand_val; DWORD old_rand; old_rand = TFB_SeedRandom ( solarSys->SysInfo.PlanetInfo.ScanSeed[ENERGY_SCAN]); - nodeI = 0; - i = 0; - do + for (i = 0; i < 16; ++i) { rand_val = TFB_Random (); solarSys->SysInfo.PlanetInfo.CurPt.x = @@ -162,11 +159,10 @@ GenerateZoqFotPik_generateEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, (HIBYTE (LOWORD (rand_val)) % (MAP_HEIGHT - (8 << 1))) + 8; solarSys->SysInfo.PlanetInfo.CurType = 1; solarSys->SysInfo.PlanetInfo.CurDensity = 0; - if (nodeI >= *whichNode) + if (i >= *whichNode) break; - ++nodeI; - } while (++i < 16); - *whichNode = nodeI; + } + *whichNode = i; TFB_SeedRandom (old_rand); return true;