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

Canceling a load from main menu aborts the game and returns to main menu; bug #679

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3188 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-10-07 02:45:26 +00:00
parent 0778e1aec5
commit 1c29a67fdc
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.7: Changes towards version 0.7:
- Canceling load from the main menu returns to main menu (bug #679) - Alex
- Fixed inputting numbers with the numpad, except directx (bug #934) - Alex - Fixed inputting numbers with the numpad, except directx (bug #934) - Alex
- Better location description in savegame summaries (bug #844) - Alex - Better location description in savegame summaries (bug #844) - Alex
- Fixed crash when saving a game into the last slot while having - Fixed crash when saving a game into the last slot while having
sc2/src/sc2code/gameopt.c
+7 -5
View File
@@ -898,7 +898,11 @@ Restart:
pMS->ModuleFrame = 0; pMS->ModuleFrame = 0;
pMS->CurState = (BYTE)pMS->delta_item; pMS->CurState = (BYTE)pMS->delta_item;
ResumeMusic (); ResumeMusic ();
if (pSolarSysState) if (LastActivity == CHECK_LOAD)
{ // Selected LOAD from main menu, and now canceled
GLOBAL (CurrentActivity) |= CHECK_ABORT;
}
else if (pSolarSysState)
{ {
#define DRAW_REFRESH (1 << 5) #define DRAW_REFRESH (1 << 5)
#define REPAIR_SCAN (1 << 6) #define REPAIR_SCAN (1 << 6)
@@ -1098,13 +1102,11 @@ ChangeGameSelection:
} }
font_DrawText (&t); font_DrawText (&t);
} }
if (LastActivity == CHECK_LOAD) if (LastActivity == CHECK_LOAD && first_time)
{ {
BYTE clut_buf[] = {FadeAllToColor}; BYTE clut_buf[] = {FadeAllToColor};
UnbatchGraphics (); UnbatchGraphics ();
LastActivity = 0;
XFormColorMap ((COLORMAPPTR)clut_buf, ONE_SECOND / 2); XFormColorMap ((COLORMAPPTR)clut_buf, ONE_SECOND / 2);
} }
else else
@@ -1236,7 +1238,7 @@ DoGameOptions (MENU_STATE *pMS)
return (FALSE); return (FALSE);
if (LastActivity == CHECK_LOAD) if (LastActivity == CHECK_LOAD)
force_select = TRUE; force_select = TRUE; // Selected LOAD from main menu
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
sc2/src/sc2code/planets/pstarmap.c
+1 -1
View File
@@ -1717,7 +1717,7 @@ DoFlagshipCommands (MENU_STATE *pMS)
NewState = pMS->CurState; NewState = pMS->CurState;
if (LastActivity == CHECK_LOAD) if (LastActivity == CHECK_LOAD)
select = TRUE; select = TRUE; // Selected LOAD from main menu
if (select) if (select)
{ {
if (NewState != SCAN + 1 && NewState != (GAME_MENU) + 1) if (NewState != SCAN + 1 && NewState != (GAME_MENU) + 1)
sc2/src/sc2code/planets/solarsys.c
+2
View File
@@ -1236,7 +1236,9 @@ IP_frame (void)
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
DrawStatusMessage (NULL); DrawStatusMessage (NULL);
if (LastActivity == CHECK_LOAD) if (LastActivity == CHECK_LOAD)
{ // Selected LOAD from main menu
pSolarSysState->MenuState.CurState = (ROSTER + 1) + 1; pSolarSysState->MenuState.CurState = (ROSTER + 1) + 1;
}
else else
{ {
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);