From ae48639ea94c5fc901ee4e6408e834ead57c8463 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Thu, 20 Apr 2006 22:22:04 +0000
Subject: [PATCH] Fixed static vars not reinited; bug #870

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2314 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/comm/melnorm/melnorm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sc2/src/sc2code/comm/melnorm/melnorm.c b/sc2/src/sc2code/comm/melnorm/melnorm.c
index 570f35805..c778bf8d1 100644
--- a/sc2/src/sc2code/comm/melnorm/melnorm.c
+++ b/sc2/src/sc2code/comm/melnorm/melnorm.c
@@ -1415,14 +1415,11 @@ NatureOfConversation (RESPONSE_REF R)
 	}
 }
 
+static BYTE local_stack0, local_stack1;
+
 static void
 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))
 	{
 		XFormColorMap (GetColorMapAddress (
@@ -1865,6 +1862,9 @@ init_melnorme_comm (void)
 	melnorme_desc.AlienTextTemplate.align = ALIGN_CENTER;
 	melnorme_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
 
+	local_stack0 = 0;
+	local_stack1 = 0;
+
 	SET_GAME_STATE (BATTLE_SEGUE, 0);
 	AskedToBuy = FALSE;
 	retval = &melnorme_desc;