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

Fixed Commander Hayes mouth movement before radioactives are given (bug

Browse Source 
#343)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1007 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-07-02 17:56:29 +00:00
parent 802de4aef7
commit 36bbaa1465
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.3: 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 - Fix glitches in slylandro probe animation (bugs #398, #399), from Paxtez
- Confirmation dialog box for exiting the game is now menu-based - Confirmation dialog box for exiting the game is now menu-based
- Commander Hayes explains his predicament before you get the option to - Commander Hayes explains his predicament before you get the option to
sc2/src/sc2code/comm.c
+7 -6
View File
@@ -538,8 +538,9 @@ uninit_communication (void)
subtitle_cache = NULL; subtitle_cache = NULL;
} }
static BOOLEAN ColorChange; static volatile BOOLEAN ColorChange;
static BOOLEAN ClearSubtitle = FALSE; static volatile BOOLEAN SummaryChange;
static volatile BOOLEAN ClearSubtitle;
/* Only one thread should ever be allowed to be calling this at any time */ /* Only one thread should ever be allowed to be calling this at any time */
void void
@@ -1218,16 +1219,16 @@ int ambient_anim_task(void* data)
OldContext = SetContext (TaskContext); OldContext = SetContext (TaskContext);
if (ColorChange) if (ColorChange || SummaryChange)
{ {
FRAME F; FRAME F;
F = CommData.AlienFrame; F = CommData.AlienFrame;
CommData.AlienFrame = CommFrame; CommData.AlienFrame = CommFrame;
DrawAlienFrame (TalkFrame, &Sequencer[CommData.NumAnimations - 1]); DrawAlienFrame (TalkFrame, &Sequencer[CommData.NumAnimations - 1]);
CommData.AlienFrame = F; CommData.AlienFrame = F;
ColorChange = FALSE;
ClearSub = TRUE;
CheckSub = 1; CheckSub = 1;
ClearSub = SummaryChange ? TRUE : FALSE;
ColorChange = SummaryChange = FALSE;
} }
if (Change || ClearSub) if (Change || ClearSub)
{ {
@@ -1798,7 +1799,7 @@ DoCommunication (PENCOUNTER_STATE pES)
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)); SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
DrawFilledRectangle (&r); DrawFilledRectangle (&r);
ClearSemaphore (GraphicsSem); ClearSemaphore (GraphicsSem);
ColorChange = TRUE; SummaryChange = TRUE;
summary = FALSE; summary = FALSE;
FlushInput (); FlushInput ();
while (AnyButtonPress (TRUE)) while (AnyButtonPress (TRUE))