Pressing F10 at main menu only tries to exit as long as you hold the
key down now (addresses #396) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1012 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -149,6 +149,8 @@ DoConfirmExit (void)
|
|||||||
GameExiting = FALSE;
|
GameExiting = FALSE;
|
||||||
GLOBAL (CurrentActivity) &= ~CHECK_ABORT;
|
GLOBAL (CurrentActivity) &= ~CHECK_ABORT;
|
||||||
}
|
}
|
||||||
|
ExitRequested = FALSE;
|
||||||
|
GamePaused = FALSE;
|
||||||
FlushInput ();
|
FlushInput ();
|
||||||
SetContext (oldContext);
|
SetContext (oldContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,6 +84,11 @@ DWORD InTime;
|
|||||||
static BOOLEAN
|
static BOOLEAN
|
||||||
DoRestart (PMENU_STATE pMS)
|
DoRestart (PMENU_STATE pMS)
|
||||||
{
|
{
|
||||||
|
/* Cancel any presses of the Pause or Exit keys. */
|
||||||
|
GamePaused = FALSE;
|
||||||
|
ExitRequested = FALSE;
|
||||||
|
|
||||||
|
|
||||||
if (!pMS->Initialized)
|
if (!pMS->Initialized)
|
||||||
{
|
{
|
||||||
DrawRestartMenu ((BYTE)~0, pMS->CurState, pMS->CurFrame);
|
DrawRestartMenu ((BYTE)~0, pMS->CurState, pMS->CurFrame);
|
||||||
@@ -130,10 +135,6 @@ else if (InputState & DEVICE_EXIT) return (FALSE);
|
|||||||
SetFlashRect (NULL_PTR, (FRAME)0);
|
SetFlashRect (NULL_PTR, (FRAME)0);
|
||||||
ClearSemaphore (GraphicsSem);
|
ClearSemaphore (GraphicsSem);
|
||||||
|
|
||||||
/* Cancel any presses of the Pause or Exit keys. */
|
|
||||||
GamePaused = FALSE;
|
|
||||||
ExitRequested = FALSE;
|
|
||||||
|
|
||||||
return (FALSE);
|
return (FALSE);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user