diff options
| author | Paul Gilbert | 2018-04-07 15:53:27 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-04-07 15:53:27 -0400 |
| commit | c1ae84881883363da05bfdb53ad274bd4814c057 (patch) | |
| tree | b27dfd25b4f2f16e92c946101fe32f2d98550197 /engines/xeen/xeen.h | |
| parent | 569833b4ca80116efaab15e47d0097b5c62ecb6c (diff) | |
| download | scummvm-rg350-c1ae84881883363da05bfdb53ad274bd4814c057.tar.gz scummvm-rg350-c1ae84881883363da05bfdb53ad274bd4814c057.tar.bz2 scummvm-rg350-c1ae84881883363da05bfdb53ad274bd4814c057.zip | |
XEEN: Allow loading savegames during combat using GMM
The original didn't allow loading during combat from it's
options dialog, and I'll leave that untouched, but the ability
to load out of a unwinnable combat is too convenient to not
allow in some form.
Diffstat (limited to 'engines/xeen/xeen.h')
| -rw-r--r-- | engines/xeen/xeen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/xeen/xeen.h b/engines/xeen/xeen.h index 774e97bea5..2cd42fdb0a 100644 --- a/engines/xeen/xeen.h +++ b/engines/xeen/xeen.h @@ -219,9 +219,9 @@ public: void GUIError(const char *msg, ...) GCC_PRINTF(2, 3); /** - * Returns true if the game should be exited (and likely return to game menu) + * Returns true if the game should be exited (either quitting, exiting to the main menu, or loading a savegame) */ - bool shouldExit() const { return _gameMode != GMODE_NONE || shouldQuit(); } + bool shouldExit() const { return _gameMode != GMODE_NONE || isLoadPending() || shouldQuit(); } /** * Returns true if a savegame load is pending |