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

Aliens no longer talk while deciding whether or not to quit (fixes #403)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1015 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-07-04 09:37:12 +00:00
parent ebd940d2c7
commit a7ec62b023
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/confirm.c
+7 -2
View File
@@ -19,6 +19,7 @@
#include <ctype.h> #include <ctype.h>
#include "starcon.h" #include "starcon.h"
#include "commglue.h" #include "commglue.h"
#include "comm.h"
#include "libs/sound/trackplayer.h" #include "libs/sound/trackplayer.h"
#define CONFIRM_WIN_WIDTH 80 #define CONFIRM_WIN_WIDTH 80
@@ -74,7 +75,7 @@ DoConfirmExit (void)
fprintf (stderr, "Confirming Exit!\n"); fprintf (stderr, "Confirming Exit!\n");
if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE) if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE)
SuspendGameClock (); SuspendGameClock ();
else if (CommData.ConversationPhrases && PlayingTrack ()) if (CommData.ConversationPhrases && PlayingTrack ())
PauseTrack (); PauseTrack ();
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
@@ -158,8 +159,12 @@ DoConfirmExit (void)
if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE) if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE)
ResumeGameClock (); ResumeGameClock ();
else if (CommData.ConversationPhrases && PlayingTrack ()) if (CommData.ConversationPhrases && PlayingTrack ())
{
ResumeTrack (); ResumeTrack ();
if (CommData.AlienTransitionDesc.AnimFlags & TALK_DONE)
do_subtitles ((void *)~0);
}
fprintf (stderr, "Exit was %sconfirmed.\n", result ? "" : "NOT "); fprintf (stderr, "Exit was %sconfirmed.\n", result ? "" : "NOT ");
return (result); return (result);