Menu
▾
▴
[Sc2-cvs] SF.net SVN: sc2:[3267] trunk/sc2/src/uqm
|
From: <av...@us...> - 2009-10-31 01:18:01
|
Revision: 3267
http://sc2.svn.sourceforge.net/sc2/?rev=3267&view=rev
Author: avolkov
Date: 2009-10-31 01:17:53 +0000 (Sat, 31 Oct 2009)
Log Message:
-----------
Battle & ship code cleanup: better name 'allied_state' for FLEET_INFO.ship_flags
Modified Paths:
--------------
trunk/sc2/src/uqm/build.c
trunk/sc2/src/uqm/gameev.c
trunk/sc2/src/uqm/globdata.c
trunk/sc2/src/uqm/load.c
trunk/sc2/src/uqm/races.h
trunk/sc2/src/uqm/save.c
trunk/sc2/src/uqm/shipyard.c
trunk/sc2/src/uqm/uqmdebug.c
Modified: trunk/sc2/src/uqm/build.c
===================================================================
--- trunk/sc2/src/uqm/build.c 2009-10-31 00:57:09 UTC (rev 3266)
+++ trunk/sc2/src/uqm/build.c 2009-10-31 01:17:53 UTC (rev 3267)
@@ -123,7 +123,7 @@
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 @@
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 @@
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 @@
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;
Modified: trunk/sc2/src/uqm/gameev.c
===================================================================
--- trunk/sc2/src/uqm/gameev.c 2009-10-31 00:57:09 UTC (rev 3266)
+++ trunk/sc2/src/uqm/gameev.c 2009-10-31 01:17:53 UTC (rev 3267)
@@ -112,7 +112,7 @@
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 @@
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 @@
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 @@
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 @@
{
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 @@
(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);
}
Modified: trunk/sc2/src/uqm/globdata.c
===================================================================
--- trunk/sc2/src/uqm/globdata.c 2009-10-31 00:57:09 UTC (rev 3266)
+++ trunk/sc2/src/uqm/globdata.c 2009-10-31 01:17:53 UTC (rev 3267)
@@ -245,7 +245,7 @@
}
}
- FleetPtr->ship_flags = BAD_GUY;
+ FleetPtr->allied_state = BAD_GUY;
FleetPtr->known_strength = 0;
FleetPtr->loc = FleetPtr->known_loc;
// XXX: Hack: Rebel special case
Modified: trunk/sc2/src/uqm/load.c
===================================================================
--- trunk/sc2/src/uqm/load.c 2009-10-31 00:57:09 UTC (rev 3266)
+++ trunk/sc2/src/uqm/load.c 2009-10-31 01:17:53 UTC (rev 3267)
@@ -210,7 +210,7 @@
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);
Modified: trunk/sc2/src/uqm/races.h
===================================================================
--- trunk/sc2/src/uqm/races.h 2009-10-31 00:57:09 UTC (rev 3266)
+++ trunk/sc2/src/uqm/races.h 2009-10-31 01:17:53 UTC (rev 3267)
@@ -339,7 +339,7 @@
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;
Modified: trunk/sc2/src/uqm/save.c
===================================================================
--- trunk/sc2/src/uqm/save.c 2009-10-31 00:57:09 UTC (rev 3266)
+++ trunk/sc2/src/uqm/save.c 2009-10-31 01:17:53 UTC (rev 3267)
@@ -190,7 +190,7 @@
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);
Modified: trunk/sc2/src/uqm/shipyard.c
===================================================================
--- trunk/sc2/src/uqm/shipyard.c 2009-10-31 00:57:09 UTC (rev 3266)
+++ trunk/sc2/src/uqm/shipyard.c 2009-10-31 01:17:53 UTC (rev 3267)
@@ -156,7 +156,7 @@
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 @@
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;
Modified: trunk/sc2/src/uqm/uqmdebug.c
===================================================================
--- trunk/sc2/src/uqm/uqmdebug.c 2009-10-31 00:57:09 UTC (rev 3266)
+++ trunk/sc2/src/uqm/uqmdebug.c 2009-10-31 01:17:53 UTC (rev 3267)
@@ -541,8 +541,8 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
