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

Battle & ship code cleanup: better name 'allied_state' for FLEET_INFO.ship_flags

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3267 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-10-31 01:17:53 +00:00
parent a56719420e
commit 06f1e11b33
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/build.c
+7 -7
View File
@@ -123,7 +123,7 @@ ActivateStarShip (COUNT which_ship, SIZE state)
which_ship = FleetPtr->known_strength; which_ship = FleetPtr->known_strength;
else if (FleetPtr->actual_strength == 0) 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; which_ship = 0;
} }
else if (FleetPtr->known_strength == 0 else if (FleetPtr->known_strength == 0
@@ -185,7 +185,7 @@ ActivateStarShip (COUNT which_ship, SIZE state)
COUNT flags; COUNT flags;
FLEET_INFO *FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), FLEET_INFO *FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q),
hFleet); hFleet);
flags = FleetPtr->ship_flags & (GOOD_GUY | BAD_GUY); flags = FleetPtr->allied_state & (GOOD_GUY | BAD_GUY);
UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet); UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet);
return flags; return flags;
} }
@@ -195,17 +195,17 @@ ActivateStarShip (COUNT which_ship, SIZE state)
FLEET_INFO *FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), FLEET_INFO *FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q),
hFleet); hFleet);
if (!(FleetPtr->ship_flags & (GOOD_GUY | BAD_GUY))) if (!(FleetPtr->allied_state & (GOOD_GUY | BAD_GUY)))
{ /* Strange request, silently ignore it */ { /* Strange request, silently ignore it */
UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet); UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet);
break; break;
} }
FleetPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); FleetPtr->allied_state &= ~(GOOD_GUY | BAD_GUY);
if (state == SET_ALLIED) if (state == SET_ALLIED)
FleetPtr->ship_flags |= GOOD_GUY; FleetPtr->allied_state |= GOOD_GUY;
else else
FleetPtr->ship_flags |= BAD_GUY; FleetPtr->allied_state |= BAD_GUY;
UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet); UnlockFleetInfo (&GLOBAL (avail_race_q), hFleet);
break; break;
@@ -381,7 +381,7 @@ CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level)
SHIP_FRAGMENT *ShipFragPtr; SHIP_FRAGMENT *ShipFragPtr;
ShipFragPtr = LockShipFrag (pDstQueue, hBuiltShip); ShipFragPtr = LockShipFrag (pDstQueue, hBuiltShip);
ShipFragPtr->which_side = TemplatePtr->ship_flags & ShipFragPtr->which_side = TemplatePtr->allied_state &
(GOOD_GUY | BAD_GUY); (GOOD_GUY | BAD_GUY);
ShipFragPtr->captains_name_index = captains_name_index; ShipFragPtr->captains_name_index = captains_name_index;
ShipFragPtr->race_strings = TemplatePtr->race_strings; ShipFragPtr->race_strings = TemplatePtr->race_strings;
sc2/src/uqm/gameev.c
+7 -7
View File
@@ -112,7 +112,7 @@ EventHandler (BYTE selector)
ZOQFOTPIK_SHIP); ZOQFOTPIK_SHIP);
ZoqFotPtr = LockFleetInfo (&GLOBAL (avail_race_q), hZoqFot); ZoqFotPtr = LockFleetInfo (&GLOBAL (avail_race_q), hZoqFot);
ZoqFotPtr->actual_strength = 0; ZoqFotPtr->actual_strength = 0;
ZoqFotPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); ZoqFotPtr->allied_state &= ~(GOOD_GUY | BAD_GUY);
UnlockFleetInfo (&GLOBAL (avail_race_q), hZoqFot); UnlockFleetInfo (&GLOBAL (avail_race_q), hZoqFot);
SET_GAME_STATE (ZOQFOT_DISTRESS, 2); SET_GAME_STATE (ZOQFOT_DISTRESS, 2);
@@ -283,7 +283,7 @@ check_race_growth (void)
if (delta_strength <= 0) if (delta_strength <= 0)
{ {
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) else if (delta_strength > MAX_FLEET_STRENGTH)
delta_strength = MAX_FLEET_STRENGTH; delta_strength = MAX_FLEET_STRENGTH;
@@ -342,7 +342,7 @@ black_urquan_genocide (void)
if (dx == 0 && dy == 0) if (dx == 0 && dy == 0)
{ {
// Arrived at the victim's home world. Cleanse it. // 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; FleetPtr->actual_strength = 0;
} }
else if (FleetPtr->actual_strength) else if (FleetPtr->actual_strength)
@@ -437,7 +437,7 @@ pkunk_mission (void)
if (PkunkPtr->actual_strength == 0) if (PkunkPtr->actual_strength == 0)
{ {
SET_GAME_STATE (YEHAT_ABSORBED_PKUNK, 1); 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); ActivateStarShip (YEHAT_SHIP, SPHERE_TRACKING);
} }
else else
@@ -540,8 +540,8 @@ ilwrath_mission (void)
{ {
IlwrathPtr->actual_strength = 0; IlwrathPtr->actual_strength = 0;
ThraddPtr->actual_strength = 0; ThraddPtr->actual_strength = 0;
IlwrathPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); IlwrathPtr->allied_state &= ~(GOOD_GUY | BAD_GUY);
ThraddPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); ThraddPtr->allied_state &= ~(GOOD_GUY | BAD_GUY);
} }
else if (IlwrathPtr->actual_strength) else if (IlwrathPtr->actual_strength)
{ {
@@ -575,7 +575,7 @@ ilwrath_mission (void)
(BYTE)(((strength_loss % MADD_LENGTH) << 8) / MADD_LENGTH); (BYTE)(((strength_loss % MADD_LENGTH) << 8) / MADD_LENGTH);
SET_GAME_STATE (THRADD_VISITS, 0); SET_GAME_STATE (THRADD_VISITS, 0);
if (ThraddPtr->ship_flags & GOOD_GUY) if (ThraddPtr->allied_state & GOOD_GUY)
ActivateStarShip (THRADDASH_SHIP, SET_NOT_ALLIED); ActivateStarShip (THRADDASH_SHIP, SET_NOT_ALLIED);
} }
sc2/src/uqm/globdata.c
+1 -1
View File
@@ -245,7 +245,7 @@ InitSIS (void)
} }
} }
FleetPtr->ship_flags = BAD_GUY; FleetPtr->allied_state = BAD_GUY;
FleetPtr->known_strength = 0; FleetPtr->known_strength = 0;
FleetPtr->loc = FleetPtr->known_loc; FleetPtr->loc = FleetPtr->known_loc;
// XXX: Hack: Rebel special case // XXX: Hack: Rebel special case
sc2/src/uqm/load.c
+1 -1
View File
@@ -210,7 +210,7 @@ LoadRaceQueue (DECODE_REF fh, QUEUE *pQueue)
FleetPtr = LockFleetInfo (pQueue, hStarShip); FleetPtr = LockFleetInfo (pQueue, hStarShip);
// Read FLEET_INFO elements // 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->days_left);
cread_8 (fh, &FleetPtr->growth_fract); cread_8 (fh, &FleetPtr->growth_fract);
cread_8 (fh, &tmpb); cread_8 (fh, &tmpb);
sc2/src/uqm/races.h
+1 -1
View File
@@ -339,7 +339,7 @@ typedef struct
SPECIES_ID SpeciesID; 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 days_left; /* Days left before the fleet reachers 'dest_loc'. */
BYTE growth_fract; BYTE growth_fract;
COUNT crew_level; COUNT crew_level;
sc2/src/uqm/save.c
+1 -1
View File
@@ -190,7 +190,7 @@ SaveRaceQueue (DECODE_REF fh, QUEUE *pQueue)
cwrite_16 (fh, Index); cwrite_16 (fh, Index);
// Write FLEET_INFO elements // 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->days_left);
cwrite_8 (fh, FleetPtr->growth_fract); cwrite_8 (fh, FleetPtr->growth_fract);
cwrite_8 (fh, FleetPtr->crew_level); cwrite_8 (fh, FleetPtr->crew_level);
sc2/src/uqm/shipyard.c
+2 -2
View File
@@ -156,7 +156,7 @@ GetAvailableRaceCount (void)
FLEET_INFO *FleetPtr; FLEET_INFO *FleetPtr;
FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hStarShip); FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hStarShip);
if (FleetPtr->ship_flags & GOOD_GUY) if (FleetPtr->allied_state & GOOD_GUY)
++Index; ++Index;
hNextShip = _GetSuccLink (FleetPtr); hNextShip = _GetSuccLink (FleetPtr);
@@ -177,7 +177,7 @@ GetAvailableRaceFromIndex (BYTE Index)
FLEET_INFO *FleetPtr; FLEET_INFO *FleetPtr;
FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hStarShip); 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); UnlockFleetInfo (&GLOBAL (avail_race_q), hStarShip);
return hStarShip; return hStarShip;
sc2/src/uqm/uqmdebug.c
+2 -2
View File
@@ -541,8 +541,8 @@ activateAllShips (void)
if (FleetPtr->icons != NULL) if (FleetPtr->icons != NULL)
// Skip the Ur-Quan probe. // Skip the Ur-Quan probe.
{ {
FleetPtr->ship_flags &= ~(GOOD_GUY | BAD_GUY); FleetPtr->allied_state &= ~(GOOD_GUY | BAD_GUY);
FleetPtr->ship_flags |= GOOD_GUY; FleetPtr->allied_state |= GOOD_GUY;
} }
UnlockFleetInfo (&GLOBAL (avail_race_q), hStarShip); UnlockFleetInfo (&GLOBAL (avail_race_q), hStarShip);