From a7ec62b023f83d3dc02d742e5516bac9cc731101 Mon Sep 17 00:00:00 2001 From: gewlitys Date: Fri, 4 Jul 2003 09:37:12 +0000 Subject: [PATCH] Aliens no longer talk while deciding whether or not to quit (fixes #403) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1015 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/confirm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sc2/src/sc2code/confirm.c b/sc2/src/sc2code/confirm.c index 6497d7ecf..a56434969 100644 --- a/sc2/src/sc2code/confirm.c +++ b/sc2/src/sc2code/confirm.c @@ -19,6 +19,7 @@ #include #include "starcon.h" #include "commglue.h" +#include "comm.h" #include "libs/sound/trackplayer.h" #define CONFIRM_WIN_WIDTH 80 @@ -74,7 +75,7 @@ DoConfirmExit (void) fprintf (stderr, "Confirming Exit!\n"); if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE) SuspendGameClock (); - else if (CommData.ConversationPhrases && PlayingTrack ()) + if (CommData.ConversationPhrases && PlayingTrack ()) PauseTrack (); SetSemaphore (GraphicsSem); @@ -158,8 +159,12 @@ DoConfirmExit (void) if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE) ResumeGameClock (); - else if (CommData.ConversationPhrases && PlayingTrack ()) + if (CommData.ConversationPhrases && PlayingTrack ()) + { ResumeTrack (); + if (CommData.AlienTransitionDesc.AnimFlags & TALK_DONE) + do_subtitles ((void *)~0); + } fprintf (stderr, "Exit was %sconfirmed.\n", result ? "" : "NOT "); return (result);