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

Fixes Quit (F10) during the intro to exit to main menu; bug #862

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2354 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2006-05-05 23:15:07 +00:00
parent 02d82caa35
commit 05e0cd7467
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/restart.c
+18 -14
View File
@@ -379,23 +379,27 @@ TryStartGame (void)
BOOLEAN BOOLEAN
StartGame (void) StartGame (void)
{ {
while (!TryStartGame ()) do
{ {
if (GLOBAL (CurrentActivity) == (ACTIVITY)~0) while (!TryStartGame ())
{ // timed out {
GLOBAL (CurrentActivity) = 0; if (GLOBAL (CurrentActivity) == (ACTIVITY)~0)
SplashScreen (0); { // timed out
Credits (FALSE); GLOBAL (CurrentActivity) = 0;
SplashScreen (0);
Credits (FALSE);
}
if (GLOBAL (CurrentActivity) & CHECK_ABORT)
return (FALSE); // quit
} }
if (GLOBAL (CurrentActivity) & CHECK_ABORT) if (LastActivity & CHECK_RESTART)
return (FALSE); // quit { // starting a new game
} Introduction ();
}
if (LastActivity & CHECK_RESTART)
{ // starting a new game } while (GLOBAL (CurrentActivity) & CHECK_ABORT);
Introduction ();
}
{ {
extern STAR_DESC starmap_array[]; extern STAR_DESC starmap_array[];