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

Last subtitle no longer reappears when pausing/resuming game in dialog

Browse Source 
response choices (bug #326), from chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@935 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-04-25 19:14:53 +00:00
parent 3e51f288ab
commit 6db458b06f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/utils.c
+7 -1
View File
@@ -144,6 +144,7 @@ PauseGame (void)
CONTEXT OldContext; CONTEXT OldContext;
FRAME F; FRAME F;
HOT_SPOT OldHot; HOT_SPOT OldHot;
extern int do_subtitles (UNICODE *pStr);
if (ActivityFrame == 0 if (ActivityFrame == 0
|| (GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_PAUSE)) || (GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_PAUSE))
@@ -194,12 +195,17 @@ PauseGame (void)
WaitForNoInput (ONE_SECOND / 4); WaitForNoInput (ONE_SECOND / 4);
FlushInput (); FlushInput ();
ClearSemaphore (GraphicsSem);
if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE) if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE)
ResumeGameClock (); ResumeGameClock ();
if (CommData.ConversationPhrases && PlayingTrack ()) if (CommData.ConversationPhrases && PlayingTrack ())
{
ResumeTrack (); ResumeTrack ();
if (CommData.AlienTransitionDesc.AnimFlags & TALK_DONE)
do_subtitles ((void *)~0);
}
ClearSemaphore (GraphicsSem);
TaskSwitch (); TaskSwitch ();
GLOBAL (CurrentActivity) &= ~CHECK_PAUSE; GLOBAL (CurrentActivity) &= ~CHECK_PAUSE;