Fixed Commander Hayes mouth movement before radioactives are given (bug

#343)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1007 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/ChangeLog

@@ -1,4 +1,6 @@
 Changes towards version 0.3:
+- Fixed Commander Hayes mouth movement before radioactives are given
+  (bug #343) -Mika
 - Fix glitches in slylandro probe animation (bugs #398, #399), from Paxtez
 - Confirmation dialog box for exiting the game is now menu-based
 - Commander Hayes explains his predicament before you get the option to 

sc2/src/sc2code/comm.c

@@ -538,8 +538,9 @@ uninit_communication (void)
 	subtitle_cache = NULL;
 }
 
-static BOOLEAN ColorChange;
-static BOOLEAN ClearSubtitle = FALSE;
+static volatile BOOLEAN ColorChange;
+static volatile BOOLEAN SummaryChange;
+static volatile BOOLEAN ClearSubtitle;
 
 /* Only one thread should ever be allowed to be calling this at any time */
 void
@@ -1218,16 +1219,16 @@ int ambient_anim_task(void* data)
 
 			OldContext = SetContext (TaskContext);
 
-			if (ColorChange)
+			if (ColorChange || SummaryChange)
 			{
 				FRAME F;
 				F = CommData.AlienFrame;
 				CommData.AlienFrame = CommFrame;
 				DrawAlienFrame (TalkFrame, &Sequencer[CommData.NumAnimations - 1]);
 				CommData.AlienFrame = F;
-				ColorChange = FALSE;
-				ClearSub = TRUE;
 				CheckSub = 1;
+				ClearSub = SummaryChange ? TRUE : FALSE;
+				ColorChange = SummaryChange = FALSE;
 			}
 			if (Change || ClearSub)
 			{
@@ -1798,7 +1799,7 @@ DoCommunication (PENCOUNTER_STATE pES)
 			SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
 			DrawFilledRectangle (&r);
 			ClearSemaphore (GraphicsSem);
-			ColorChange = TRUE;
+			SummaryChange = TRUE;
 			summary = FALSE;
 			FlushInput ();
 			while (AnyButtonPress (TRUE))