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

Cleanups.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2207 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-01-20 05:49:35 +00:00
parent fdae03a438
commit 5e7eb0b41c
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/shipstat.c
+5 -5
View File
@@ -327,8 +327,9 @@ DeltaStatistics (STARSHIPPTR StarShipPtr, SIZE crew_delta, SIZE
&& (ShipInfoPtr->ship_flags & GOOD_GUY) && (ShipInfoPtr->ship_flags & GOOD_GUY)
&& LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE) && LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE)
{ {
if ((crew_delta = // SIS in full game.
GLOBAL_SIS (CrewEnlisted)) >= MAX_CREW_SIZE) crew_delta = GLOBAL_SIS (CrewEnlisted);
if (crew_delta >= MAX_CREW_SIZE)
crew_delta = MAX_CREW_SIZE; crew_delta = MAX_CREW_SIZE;
else /* if (crew_delta < MAX_CREW_SIZE) */ else /* if (crew_delta < MAX_CREW_SIZE) */
{ {
@@ -349,8 +350,7 @@ DeltaStatistics (STARSHIPPTR StarShipPtr, SIZE crew_delta, SIZE
#define ROBOT_UNIT_COLOR BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08) #define ROBOT_UNIT_COLOR BUILD_COLOR (MAKE_RGB15 (0xA, 0xA, 0xA), 0x08)
SetContextForeGroundColor ( SetContextForeGroundColor (
(ShipInfoPtr->ship_flags & CREW_IMMUNE) ? (ShipInfoPtr->ship_flags & CREW_IMMUNE) ?
ROBOT_UNIT_COLOR : CREW_UNIT_COLOR ROBOT_UNIT_COLOR : CREW_UNIT_COLOR);
);
while (crew_delta--) while (crew_delta--)
{ {
r.corner.x = x + (CREW_XOFFS + 1); r.corner.x = x + (CREW_XOFFS + 1);
@@ -363,7 +363,7 @@ DeltaStatistics (STARSHIPPTR StarShipPtr, SIZE crew_delta, SIZE
++ShipInfoPtr->crew_level; ++ShipInfoPtr->crew_level;
} }
} }
else else /* crew_delta < 0 */
{ {
if (StarShipPtr->captains_name_index == 0 if (StarShipPtr->captains_name_index == 0
&& (ShipInfoPtr->ship_flags & GOOD_GUY) && (ShipInfoPtr->ship_flags & GOOD_GUY)
sc2/src/sc2code/sounds.c
-1
View File
@@ -32,7 +32,6 @@ void
PlaySound (SOUND S, SoundPosition Pos, ELEMENTPTR PositionalObject, PlaySound (SOUND S, SoundPosition Pos, ELEMENTPTR PositionalObject,
BYTE Priority) BYTE Priority)
{ {
/* obviously number of channels is assumed to be at least 5 */
BYTE chan, c; BYTE chan, c;
static BYTE lru_channel[NUM_FX_CHANNELS] = {0, 1, 2, 3}; static BYTE lru_channel[NUM_FX_CHANNELS] = {0, 1, 2, 3};
static SOUND channel[NUM_FX_CHANNELS] = {0, 0, 0, 0}; static SOUND channel[NUM_FX_CHANNELS] = {0, 0, 0, 0};