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

Fixed static vars not reinited; bug #870

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2314 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2006-04-20 22:22:04 +00:00
parent 297e58bbca
commit ae48639ea9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/melnorm/melnorm.c
+5 -5
View File
@@ -1415,14 +1415,11 @@ NatureOfConversation (RESPONSE_REF R)
} }
} }
static BYTE local_stack0, local_stack1;
static void static void
DoBluster (RESPONSE_REF R) DoBluster (RESPONSE_REF R)
{ {
// BUG: these should really be GAME_STATE vars
// currently, you can reload a game and skip some responses
// that you've said before
static BYTE local_stack0 = 0, local_stack1 = 0;
if (PLAYER_SAID (R, trade_is_for_the_weak)) if (PLAYER_SAID (R, trade_is_for_the_weak))
{ {
XFormColorMap (GetColorMapAddress ( XFormColorMap (GetColorMapAddress (
@@ -1865,6 +1862,9 @@ init_melnorme_comm (void)
melnorme_desc.AlienTextTemplate.align = ALIGN_CENTER; melnorme_desc.AlienTextTemplate.align = ALIGN_CENTER;
melnorme_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; melnorme_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
local_stack0 = 0;
local_stack1 = 0;
SET_GAME_STATE (BATTLE_SEGUE, 0); SET_GAME_STATE (BATTLE_SEGUE, 0);
AskedToBuy = FALSE; AskedToBuy = FALSE;
retval = &melnorme_desc; retval = &melnorme_desc;