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

Removed initializers from static globals that do not need them (for clarity); fixed others that do need to be reinited; bug #870

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2298 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2006-03-28 04:10:25 +00:00
parent c37329065f
commit 623e980083
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/melnorm/melnorm.c
+3 -5
View File
@@ -230,10 +230,7 @@ ShipWorth (void)
return (worth); return (worth);
} }
static COUNT rescue_fuel = 0; static COUNT rescue_fuel;
/* We're relying on this large, #define-dependent-size structure to be
automatically initialized to 0 across the board here. */
static SIS_STATE SIS_copy; static SIS_STATE SIS_copy;
static BOOLEAN static BOOLEAN
@@ -394,7 +391,8 @@ StripShip (COUNT fuel_required)
else else
{ {
NPCPhrase (RESCUE_OFFER); NPCPhrase (RESCUE_OFFER);
if ((rescue_fuel = fuel_required) == capacity) rescue_fuel = fuel_required;
if (rescue_fuel == capacity)
NPCPhrase (RESCUE_TANKS); NPCPhrase (RESCUE_TANKS);
else else
NPCPhrase (RESCUE_HOME); NPCPhrase (RESCUE_HOME);
sc2/src/sc2code/comm/mycon/myconc.c
+3 -1
View File
@@ -102,7 +102,7 @@ static LOCDATA mycon_desc =
{ {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */
}; };
static BYTE MadeChoice = 0; static BYTE MadeChoice;
static void static void
DoRamble (RESPONSE_REF R) DoRamble (RESPONSE_REF R)
@@ -623,6 +623,8 @@ init_mycon_comm (void)
mycon_desc.AlienTextTemplate.align = ALIGN_CENTER; mycon_desc.AlienTextTemplate.align = ALIGN_CENTER;
mycon_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; mycon_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
MadeChoice = 0;
if (LOBYTE (GLOBAL (CurrentActivity)) != WON_LAST_BATTLE) if (LOBYTE (GLOBAL (CurrentActivity)) != WON_LAST_BATTLE)
{ {
SET_GAME_STATE (BATTLE_SEGUE, 1); SET_GAME_STATE (BATTLE_SEGUE, 1);
sc2/src/sc2code/comm/slyland/slyland.c
+5 -5
View File
@@ -111,11 +111,11 @@ static LOCDATA slylandro_desc =
{ {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */
}; };
static RESPONSE_REF threat = 0, static RESPONSE_REF threat,
something_wrong = 0, something_wrong,
we_are_us = 0, we_are_us,
why_attack = 0, why_attack,
bye = 0; bye;
static void static void
CombatIsInevitable (RESPONSE_REF R) CombatIsInevitable (RESPONSE_REF R)
sc2/src/sc2code/comm/starbas/starbas.c
+4 -4
View File
@@ -233,10 +233,10 @@ static void NeedInfo (RESPONSE_REF R);
static void TellHistory (RESPONSE_REF R); static void TellHistory (RESPONSE_REF R);
static void AlienRaces (RESPONSE_REF R); static void AlienRaces (RESPONSE_REF R);
static BYTE stack0 = 0, static BYTE stack0,
stack1 = 0, stack1,
stack2 = 0, stack2,
stack3 = 0; stack3;
static void static void
AllianceInfo (RESPONSE_REF R) AllianceInfo (RESPONSE_REF R)