From 06f1e11b335efa1300717bbce684e9666fbc1e1e Mon Sep 17 00:00:00 2001 From: avolkov Date: Sat, 31 Oct 2009 01:17:53 +0000 Subject: [PATCH] Battle & ship code cleanup: better name 'allied_state' for FLEET_INFO.ship_flags git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3267 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/uqm/build.c | 14 +++++++------- sc2/src/uqm/gameev.c | 14 +++++++------- sc2/src/uqm/globdata.c | 2 +- sc2/src/uqm/load.c | 2 +- sc2/src/uqm/races.h | 2 +- sc2/src/uqm/save.c | 2 +- sc2/src/uqm/shipyard.c | 4 ++-- sc2/src/uqm/uqmdebug.c | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sc2/src/uqm/build.c b/sc2/src/uqm/build.c index f2b9bfbc1..5aa7ed956 100644 --- a/sc2/src/uqm/build.c +++ b/sc2/src/uqm/build.c @@ -123,7 +123,7 @@ ActivateStarShip (COUNT which_ship, SIZE state) which_ship = FleetPtr->known_strength; else if (FleetPtr->actual_strength == 0) { - if (!(FleetPtr->ship_flags & (GOOD_GUY | BAD_GUY))) + if (!(FleetPtr->allied_state & (GOOD_GUY | BAD_GUY))) which_ship = 0; } else if (FleetPtr->known_strength == 0 @@ -185,7 +185,7 @@ ActivateStarShip (COUNT which_ship, SIZE state) COUNT flags; FLEET_INFO *FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hFleet); - flags = FleetPtr->ship_flags & (GOOD_GUY | BAD_GUY); + flags = FleetPtr->allied_state & (GOOD_GUY | BAD_GUY); UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet); return flags; } @@ -195,17 +195,17 @@ ActivateStarShip (COUNT which_ship, SIZE state) FLEET_INFO *FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hFleet); - if (!(FleetPtr->ship_flags & (GOOD_GUY | BAD_GUY))) + if (!(FleetPtr->allied_state & (GOOD_GUY | BAD_GUY))) { /* Strange request, silently ignore it */ UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet); break; } - FleetPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); + FleetPtr->allied_state &= ~(GOOD_GUY | BAD_GUY); if (state == SET_ALLIED) - FleetPtr->ship_flags |= GOOD_GUY; + FleetPtr->allied_state |= GOOD_GUY; else - FleetPtr->ship_flags |= BAD_GUY; + FleetPtr->allied_state |= BAD_GUY; UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet); break; @@ -381,7 +381,7 @@ CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level) SHIP_FRAGMENT *ShipFragPtr; ShipFragPtr = LockShipFrag (pDstQueue, hBuiltShip); - ShipFragPtr->which_side = TemplatePtr->ship_flags & + ShipFragPtr->which_side = TemplatePtr->allied_state & (GOOD_GUY | BAD_GUY); ShipFragPtr->captains_name_index = captains_name_index; ShipFragPtr->race_strings = TemplatePtr->race_strings; diff --git a/sc2/src/uqm/gameev.c b/sc2/src/uqm/gameev.c index 110f87479..32a2ba95a 100644 --- a/sc2/src/uqm/gameev.c +++ b/sc2/src/uqm/gameev.c @@ -112,7 +112,7 @@ EventHandler (BYTE selector) ZOQFOTPIK_SHIP); ZoqFotPtr = LockFleetInfo (&GLOBAL (avail_race_q), hZoqFot); ZoqFotPtr->actual_strength = 0; - ZoqFotPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); + ZoqFotPtr->allied_state &= ~(GOOD_GUY | BAD_GUY); UnlockFleetInfo (&GLOBAL (avail_race_q), hZoqFot); SET_GAME_STATE (ZOQFOT_DISTRESS, 2); @@ -283,7 +283,7 @@ check_race_growth (void) if (delta_strength <= 0) { delta_strength = 0; - FleetPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); + FleetPtr->allied_state &= ~(GOOD_GUY | BAD_GUY); } else if (delta_strength > MAX_FLEET_STRENGTH) delta_strength = MAX_FLEET_STRENGTH; @@ -342,7 +342,7 @@ black_urquan_genocide (void) if (dx == 0 && dy == 0) { // Arrived at the victim's home world. Cleanse it. - FleetPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); + FleetPtr->allied_state &= ~(GOOD_GUY | BAD_GUY); FleetPtr->actual_strength = 0; } else if (FleetPtr->actual_strength) @@ -437,7 +437,7 @@ pkunk_mission (void) if (PkunkPtr->actual_strength == 0) { SET_GAME_STATE (YEHAT_ABSORBED_PKUNK, 1); - PkunkPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); + PkunkPtr->allied_state &= ~(GOOD_GUY | BAD_GUY); ActivateStarShip (YEHAT_SHIP, SPHERE_TRACKING); } else @@ -540,8 +540,8 @@ ilwrath_mission (void) { IlwrathPtr->actual_strength = 0; ThraddPtr->actual_strength = 0; - IlwrathPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); - ThraddPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); + IlwrathPtr->allied_state &= ~(GOOD_GUY | BAD_GUY); + ThraddPtr->allied_state &= ~(GOOD_GUY | BAD_GUY); } else if (IlwrathPtr->actual_strength) { @@ -575,7 +575,7 @@ ilwrath_mission (void) (BYTE)(((strength_loss % MADD_LENGTH) << 8) / MADD_LENGTH); SET_GAME_STATE (THRADD_VISITS, 0); - if (ThraddPtr->ship_flags & GOOD_GUY) + if (ThraddPtr->allied_state & GOOD_GUY) ActivateStarShip (THRADDASH_SHIP, SET_NOT_ALLIED); } diff --git a/sc2/src/uqm/globdata.c b/sc2/src/uqm/globdata.c index 44b11a97c..b3d92f026 100644 --- a/sc2/src/uqm/globdata.c +++ b/sc2/src/uqm/globdata.c @@ -245,7 +245,7 @@ InitSIS (void) } } - FleetPtr->ship_flags = BAD_GUY; + FleetPtr->allied_state = BAD_GUY; FleetPtr->known_strength = 0; FleetPtr->loc = FleetPtr->known_loc; // XXX: Hack: Rebel special case diff --git a/sc2/src/uqm/load.c b/sc2/src/uqm/load.c index 4aeeb5508..e2027b65f 100644 --- a/sc2/src/uqm/load.c +++ b/sc2/src/uqm/load.c @@ -210,7 +210,7 @@ LoadRaceQueue (DECODE_REF fh, QUEUE *pQueue) FleetPtr = LockFleetInfo (pQueue, hStarShip); // Read FLEET_INFO elements - cread_16 (fh, &FleetPtr->ship_flags); + cread_16 (fh, &FleetPtr->allied_state); cread_8 (fh, &FleetPtr->days_left); cread_8 (fh, &FleetPtr->growth_fract); cread_8 (fh, &tmpb); diff --git a/sc2/src/uqm/races.h b/sc2/src/uqm/races.h index 5069c169b..2dbc52d77 100644 --- a/sc2/src/uqm/races.h +++ b/sc2/src/uqm/races.h @@ -339,7 +339,7 @@ typedef struct SPECIES_ID SpeciesID; - UWORD ship_flags; /* 0, GOOD_GUY, or BAD_GUY */ + UWORD allied_state; /* 0, GOOD_GUY, or BAD_GUY */ BYTE days_left; /* Days left before the fleet reachers 'dest_loc'. */ BYTE growth_fract; COUNT crew_level; diff --git a/sc2/src/uqm/save.c b/sc2/src/uqm/save.c index 11d028c54..61f37aa18 100644 --- a/sc2/src/uqm/save.c +++ b/sc2/src/uqm/save.c @@ -190,7 +190,7 @@ SaveRaceQueue (DECODE_REF fh, QUEUE *pQueue) cwrite_16 (fh, Index); // Write FLEET_INFO elements - cwrite_16 (fh, FleetPtr->ship_flags); + cwrite_16 (fh, FleetPtr->allied_state); cwrite_8 (fh, FleetPtr->days_left); cwrite_8 (fh, FleetPtr->growth_fract); cwrite_8 (fh, FleetPtr->crew_level); diff --git a/sc2/src/uqm/shipyard.c b/sc2/src/uqm/shipyard.c index 20bbd4b0a..bb212dbf1 100644 --- a/sc2/src/uqm/shipyard.c +++ b/sc2/src/uqm/shipyard.c @@ -156,7 +156,7 @@ GetAvailableRaceCount (void) FLEET_INFO *FleetPtr; FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hStarShip); - if (FleetPtr->ship_flags & GOOD_GUY) + if (FleetPtr->allied_state & GOOD_GUY) ++Index; hNextShip = _GetSuccLink (FleetPtr); @@ -177,7 +177,7 @@ GetAvailableRaceFromIndex (BYTE Index) FLEET_INFO *FleetPtr; FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hStarShip); - if ((FleetPtr->ship_flags & GOOD_GUY) && Index-- == 0) + if ((FleetPtr->allied_state & GOOD_GUY) && Index-- == 0) { UnlockFleetInfo (&GLOBAL (avail_race_q), hStarShip); return hStarShip; diff --git a/sc2/src/uqm/uqmdebug.c b/sc2/src/uqm/uqmdebug.c index b9f8a91f1..17c4db483 100644 --- a/sc2/src/uqm/uqmdebug.c +++ b/sc2/src/uqm/uqmdebug.c @@ -541,8 +541,8 @@ activateAllShips (void) if (FleetPtr->icons != NULL) // Skip the Ur-Quan probe. { - FleetPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); - FleetPtr->ship_flags |= GOOD_GUY; + FleetPtr->allied_state &= ~(GOOD_GUY | BAD_GUY); + FleetPtr->allied_state |= GOOD_GUY; } UnlockFleetInfo (&GLOBAL (avail_race_q), hStarShip);