From 5ed4bcc0dde34956038796a6071726fcb8778a96 Mon Sep 17 00:00:00 2001 From: avolkov Date: Fri, 9 Jun 2006 14:21:40 +0000 Subject: [PATCH] Removed reuses of 'battle_counter' global var git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2386 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/demo.c | 2 +- sc2/src/sc2code/encount.c | 12 ++++++------ sc2/src/sc2code/encount.h | 3 +++ sc2/src/sc2code/ipdisp.c | 9 +++++---- sc2/src/sc2code/load.c | 4 +++- sc2/src/sc2code/planets/devices.c | 8 ++++---- sc2/src/sc2code/planets/gensam.c | 6 ++++-- sc2/src/sc2code/planets/gensol.c | 3 ++- sc2/src/sc2code/planets/scan.c | 2 +- sc2/src/sc2code/planets/solarsys.c | 11 ++++++++--- sc2/src/sc2code/starcon.c | 2 +- 11 files changed, 38 insertions(+), 24 deletions(-) diff --git a/sc2/src/sc2code/demo.c b/sc2/src/sc2code/demo.c index 8c27aaa54..9fb198bb6 100644 --- a/sc2/src/sc2code/demo.c +++ b/sc2/src/sc2code/demo.c @@ -76,7 +76,7 @@ OpenJournal (void) DWORD start_seed; #if CREATE_JOURNAL - if (battle_counter) + if (create_journal) { if (journal_fh = copen (journal_buf, MEMORY_STREAM, STREAM_WRITE)) { diff --git a/sc2/src/sc2code/encount.c b/sc2/src/sc2code/encount.c index 0cb98c41c..043b6b109 100644 --- a/sc2/src/sc2code/encount.c +++ b/sc2/src/sc2code/encount.c @@ -90,7 +90,8 @@ BuildBattle (COUNT which_player) HSTARSHIP hBuiltShip; STARSHIPPTR BuiltShipPtr; - battle_counter = 0; + EncounterRace = -1; + if (GetHeadLink (&GLOBAL (npc_built_ship_q)) == 0) { SET_GAME_STATE (BATTLE_SEGUE, 0); @@ -467,9 +468,8 @@ UninitEncounter (void) hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); FragPtr = (SHIP_FRAGMENTPTR)LockStarShip (&GLOBAL (npc_built_ship_q), hStarShip); - battle_counter = GET_RACE_ID (FragPtr) + 1; - if (GetStarShipFromIndex (&GLOBAL (avail_race_q), - (COUNT)(battle_counter - 1)) == 0) + EncounterRace = GET_RACE_ID (FragPtr); + if (GetStarShipFromIndex (&GLOBAL (avail_race_q), EncounterRace) == 0) { VictoryState = -1; InitSISContexts (); @@ -580,7 +580,7 @@ UninitEncounter (void) DrawFilledRectangle (&r); /* collect bounty ResUnits */ - j = race_bounty[battle_counter - 1] >> 3; + j = race_bounty[EncounterRace] >> 3; RecycleAmount += j; sprintf (buf, "%u", RecycleAmount); t.baseline.x = r.corner.x + r.extent.width - 1; @@ -689,7 +689,7 @@ UninitEncounter (void) DrawStatusMessage (NULL_PTR); } - if (ships_killed && (battle_counter - 1) == THRADDASH_SHIP + if (ships_killed && EncounterRace == THRADDASH_SHIP && !GET_GAME_STATE (THRADD_MANNER)) { if ((ships_killed += GET_GAME_STATE (THRADDASH_BODY_COUNT)) > diff --git a/sc2/src/sc2code/encount.h b/sc2/src/sc2code/encount.h index 0dcfbcae0..eed9dc04c 100644 --- a/sc2/src/sc2code/encount.h +++ b/sc2/src/sc2code/encount.h @@ -176,5 +176,8 @@ extern void GenerateSupox (BYTE control); extern void GenerateRainbow (BYTE control); extern void GenerateIlwrath (BYTE control); +extern SIZE EncounterRace; +extern BYTE EncounterGroup; + #endif /* _ENCOUNT_H */ diff --git a/sc2/src/sc2code/ipdisp.c b/sc2/src/sc2code/ipdisp.c index 909502411..d15c1ea84 100644 --- a/sc2/src/sc2code/ipdisp.c +++ b/sc2/src/sc2code/ipdisp.c @@ -20,6 +20,7 @@ #include "globdata.h" #include "init.h" #include "races.h" +#include "encount.h" #include "libs/mathlib.h" @@ -545,7 +546,7 @@ ip_group_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT } else { - battle_counter = (SIZE)GET_GROUP_ID (StarShipPtr); + EncounterGroup = GET_GROUP_ID (StarShipPtr); if (GET_RACE_ID (StarShipPtr) == URQUAN_PROBE_SHIP) { @@ -826,10 +827,10 @@ DoMissions (void) spawn_flag_ship (); - if (battle_counter) + if (EncounterRace >= 0) { - NotifyOthers ((COUNT)(battle_counter - 1), 0); - battle_counter = 0; + NotifyOthers (EncounterRace, 0); + EncounterRace = -1; } for (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); diff --git a/sc2/src/sc2code/load.c b/sc2/src/sc2code/load.c index 83bc15d09..67d8b259b 100644 --- a/sc2/src/sc2code/load.c +++ b/sc2/src/sc2code/load.c @@ -354,7 +354,9 @@ LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc) cclose (fh); res_CloseResFile (in_fp); - battle_counter = 0; + EncounterGroup = 0; + EncounterRace = -1; + ReinitQueue (&race_q[0]); ReinitQueue (&race_q[1]); CurStarDescPtr = FindStar (NULL_PTR, &SD.star_pt, 0, 0); diff --git a/sc2/src/sc2code/planets/devices.c b/sc2/src/sc2code/planets/devices.c index 2d48ef9c1..37d8539e4 100644 --- a/sc2/src/sc2code/planets/devices.c +++ b/sc2/src/sc2code/planets/devices.c @@ -226,7 +226,7 @@ DeviceFailed (BYTE which_device) { SET_GAME_STATE (CHMMR_EMERGING, 1); - battle_counter = 0; + EncounterGroup = 0; GLOBAL (CurrentActivity) |= START_ENCOUNTER; PutGroupInfo (GROUPS_RANDOM, GROUP_SAVE_IP); @@ -267,7 +267,7 @@ DeviceFailed (BYTE which_device) } else { - battle_counter = 0; + EncounterGroup = 0; if (GetHeadLink (&GLOBAL (npc_built_ship_q))) { SET_GAME_STATE (SHIP_TO_COMPEL, 1); @@ -329,7 +329,7 @@ DeviceFailed (BYTE which_device) NextActivity |= CHECK_LOAD; /* fake a load game */ GLOBAL (CurrentActivity) |= START_ENCOUNTER; - battle_counter = 0; + EncounterGroup = 0; PutGroupInfo (GROUPS_RANDOM, GROUP_SAVE_IP); ReinitQueue (&GLOBAL (npc_built_ship_q)); @@ -366,7 +366,7 @@ DeviceFailed (BYTE which_device) NextActivity |= CHECK_LOAD; /* fake a load game */ GLOBAL (CurrentActivity) |= START_ENCOUNTER; - battle_counter = 0; + EncounterGroup = 0; PutGroupInfo (GROUPS_RANDOM, GROUP_SAVE_IP); ReinitQueue (&GLOBAL (npc_built_ship_q)); diff --git a/sc2/src/sc2code/planets/gensam.c b/sc2/src/sc2code/planets/gensam.c index 70d608f6f..ffa56d6fe 100644 --- a/sc2/src/sc2code/planets/gensam.c +++ b/sc2/src/sc2code/planets/gensam.c @@ -155,7 +155,8 @@ GenerateSamatra (BYTE control) break; case REINIT_NPCS: GetGroupInfo (GROUPS_RANDOM, GROUP_LOAD_IP); - battle_counter = 0; + EncounterGroup = 0; + EncounterRace = -1; // Do not want guards to chase the player { BOOLEAN GuardEngaged; HSTARSHIP hStarShip, hNextShip; @@ -290,7 +291,8 @@ GenerateSamatra (BYTE control) } else { - battle_counter = 0; + EncounterGroup = 0; + EncounterRace = -1; GLOBAL (CurrentActivity) = IN_LAST_BATTLE | START_ENCOUNTER; if (GET_GAME_STATE (YEHAT_CIVIL_WAR) && ActivateStarShip (YEHAT_SHIP, SPHERE_TRACKING) diff --git a/sc2/src/sc2code/planets/gensol.c b/sc2/src/sc2code/planets/gensol.c index 43c4f2ed2..b65a46248 100644 --- a/sc2/src/sc2code/planets/gensol.c +++ b/sc2/src/sc2code/planets/gensol.c @@ -25,6 +25,7 @@ #include "races.h" #include "resinst.h" #include "state.h" +#include "encount.h" #include "planets/genall.h" #include "libs/mathlib.h" @@ -189,7 +190,7 @@ generate_orbital (void) PutGroupInfo (GROUPS_RANDOM, GROUP_SAVE_IP); ReinitQueue (&GLOBAL (npc_built_ship_q)); - battle_counter = 0; + EncounterGroup = 0; GLOBAL (CurrentActivity) |= START_ENCOUNTER; SET_GAME_STATE (GLOBAL_FLAGS_AND_DATA, (BYTE)~0); return; diff --git a/sc2/src/sc2code/planets/scan.c b/sc2/src/sc2code/planets/scan.c index 44c9180f0..9eb27b2de 100644 --- a/sc2/src/sc2code/planets/scan.c +++ b/sc2/src/sc2code/planets/scan.c @@ -767,7 +767,7 @@ PickPlanetSide (PMENU_STATE pMS) NextActivity |= CHECK_LOAD; /* fake a load game */ GLOBAL (CurrentActivity) |= START_ENCOUNTER; - battle_counter = 0; + EncounterGroup = 0; PutGroupInfo (GROUPS_RANDOM, GROUP_SAVE_IP); ReinitQueue (&GLOBAL (npc_built_ship_q)); diff --git a/sc2/src/sc2code/planets/solarsys.c b/sc2/src/sc2code/planets/solarsys.c index 42c613bb7..b958a3314 100644 --- a/sc2/src/sc2code/planets/solarsys.c +++ b/sc2/src/sc2code/planets/solarsys.c @@ -46,6 +46,10 @@ COLORMAP OrbitalCMap; COLORMAP SunCMap; MUSIC_REF SpaceMusic; +SIZE EncounterRace; +BYTE EncounterGroup; + // last encountered group info + #define DRAW_STARS (1 << 0) #define DRAW_PLANETS (1 << 1) #define DRAW_ORBITS (1 << 2) @@ -1453,7 +1457,8 @@ InitSolarSys (void) } else { - battle_counter = 0; + EncounterRace = -1; + EncounterGroup = 0; GLOBAL (BattleGroupRef) = 0; ReinitQueue (&GLOBAL (npc_built_ship_q)); (*pSolarSysState->GenFunc) (INIT_NPCS); @@ -1532,9 +1537,9 @@ UninitSolarSys (void) SET_GAME_STATE (USED_BROADCASTER, 0); } - else if ((GLOBAL (CurrentActivity) & START_ENCOUNTER) && battle_counter) + else if ((GLOBAL (CurrentActivity) & START_ENCOUNTER) && EncounterGroup) { - GetGroupInfo (GLOBAL (BattleGroupRef), (BYTE)battle_counter); + GetGroupInfo (GLOBAL (BattleGroupRef), EncounterGroup); if (HIWORD (GLOBAL (ShipStamp.frame)) == 0) { BYTE i; diff --git a/sc2/src/sc2code/starcon.c b/sc2/src/sc2code/starcon.c index fe7586043..797025a82 100644 --- a/sc2/src/sc2code/starcon.c +++ b/sc2/src/sc2code/starcon.c @@ -124,7 +124,7 @@ while (--ac > 0) #endif //DEBUG_PSYTRON #if CREATE_JOURNAL case 'j': - ++battle_counter; + ++create_journal; break; #endif //CREATE_JOURNAL }