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.cpp | |
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.cpp')
-rw-r--r-- | engines/xeen/xeen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp index 5f6243c045..8300040c62 100644 --- a/engines/xeen/xeen.cpp +++ b/engines/xeen/xeen.cpp @@ -189,7 +189,7 @@ Common::Error XeenEngine::loadGameState(int slot) { } bool XeenEngine::canLoadGameStateCurrently() { - return _mode != MODE_COMBAT && _mode != MODE_STARTUP; + return _mode != MODE_STARTUP; } bool XeenEngine::canSaveGameStateCurrently() { @@ -256,7 +256,7 @@ void XeenEngine::play() { void XeenEngine::gameLoop() { // Main game loop - while (!shouldExit()) { + while (isLoadPending() || !shouldExit()) { if (isLoadPending()) { // Load any pending savegame int saveSlot = _loadSaveSlot; @@ -268,7 +268,7 @@ void XeenEngine::gameLoop() { _map->cellFlagLookup(_party->_mazePosition); if (_map->_currentIsEvent) { _gameMode = (GameMode)_scripts->checkEvents(); - if (shouldExit() || _gameMode) + if (shouldExit()) return; } _party->giveTreasure(); |