Fix game-clock crash when pausing game during ending sequences
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2027 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -157,7 +157,8 @@ PauseGame (void)
|
|||||||
|
|
||||||
GLOBAL (CurrentActivity) |= CHECK_PAUSE;
|
GLOBAL (CurrentActivity) |= CHECK_PAUSE;
|
||||||
|
|
||||||
if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE)
|
if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE &&
|
||||||
|
LOBYTE (GLOBAL (CurrentActivity)) != WON_LAST_BATTLE)
|
||||||
SuspendGameClock ();
|
SuspendGameClock ();
|
||||||
if (CommData.ConversationPhrases && PlayingTrack ())
|
if (CommData.ConversationPhrases && PlayingTrack ())
|
||||||
PauseTrack ();
|
PauseTrack ();
|
||||||
@@ -202,7 +203,8 @@ PauseGame (void)
|
|||||||
WaitForNoInput (ONE_SECOND / 4);
|
WaitForNoInput (ONE_SECOND / 4);
|
||||||
FlushInput ();
|
FlushInput ();
|
||||||
|
|
||||||
if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE)
|
if (LOBYTE (GLOBAL (CurrentActivity)) != SUPER_MELEE &&
|
||||||
|
LOBYTE (GLOBAL (CurrentActivity)) != WON_LAST_BATTLE)
|
||||||
ResumeGameClock ();
|
ResumeGameClock ();
|
||||||
if (CommData.ConversationPhrases && PlayingTrack ())
|
if (CommData.ConversationPhrases && PlayingTrack ())
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user