From 6db458b06f2961e655eaf1852151ab4f5a848eff Mon Sep 17 00:00:00 2001 From: gewlitys Date: Fri, 25 Apr 2003 19:14:53 +0000 Subject: [PATCH] Last subtitle no longer reappears when pausing/resuming game in dialog response choices (bug #326), from chmmravatar git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@935 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/utils.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sc2/src/sc2code/utils.c b/sc2/src/sc2code/utils.c index 159ff4fd7..e116c614e 100644 --- a/sc2/src/sc2code/utils.c +++ b/sc2/src/sc2code/utils.c @@ -144,6 +144,7 @@ PauseGame (void) CONTEXT OldContext; FRAME F; HOT_SPOT OldHot; + extern int do_subtitles (UNICODE *pStr); if (ActivityFrame == 0 || (GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_PAUSE)) @@ -194,12 +195,17 @@ PauseGame (void) WaitForNoInput (ONE_SECOND / 4); FlushInput (); - ClearSemaphore (GraphicsSem); if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE) ResumeGameClock (); if (CommData.ConversationPhrases && PlayingTrack ()) + { ResumeTrack (); + if (CommData.AlienTransitionDesc.AnimFlags & TALK_DONE) + do_subtitles ((void *)~0); + } + + ClearSemaphore (GraphicsSem); TaskSwitch (); GLOBAL (CurrentActivity) &= ~CHECK_PAUSE;