Fixes Quit (F10) during the intro to exit to main menu; bug #862
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2354 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
+18
-14
@@ -379,23 +379,27 @@ TryStartGame (void)
|
||||
BOOLEAN
|
||||
StartGame (void)
|
||||
{
|
||||
while (!TryStartGame ())
|
||||
do
|
||||
{
|
||||
if (GLOBAL (CurrentActivity) == (ACTIVITY)~0)
|
||||
{ // timed out
|
||||
GLOBAL (CurrentActivity) = 0;
|
||||
SplashScreen (0);
|
||||
Credits (FALSE);
|
||||
while (!TryStartGame ())
|
||||
{
|
||||
if (GLOBAL (CurrentActivity) == (ACTIVITY)~0)
|
||||
{ // timed out
|
||||
GLOBAL (CurrentActivity) = 0;
|
||||
SplashScreen (0);
|
||||
Credits (FALSE);
|
||||
}
|
||||
|
||||
if (GLOBAL (CurrentActivity) & CHECK_ABORT)
|
||||
return (FALSE); // quit
|
||||
}
|
||||
|
||||
if (GLOBAL (CurrentActivity) & CHECK_ABORT)
|
||||
return (FALSE); // quit
|
||||
}
|
||||
|
||||
if (LastActivity & CHECK_RESTART)
|
||||
{ // starting a new game
|
||||
Introduction ();
|
||||
}
|
||||
if (LastActivity & CHECK_RESTART)
|
||||
{ // starting a new game
|
||||
Introduction ();
|
||||
}
|
||||
|
||||
} while (GLOBAL (CurrentActivity) & CHECK_ABORT);
|
||||
|
||||
{
|
||||
extern STAR_DESC starmap_array[];
|
||||
|
||||
Reference in New Issue
Block a user