diff options
| author | Paul Gilbert | 2018-04-15 09:51:18 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-04-15 09:51:18 -0400 |
| commit | caba18856914daac4339f040b39b7b73795c6310 (patch) | |
| tree | daa3eba759f936a6491fb9f5f9e79fc1cd0d7e91 /engines/xeen/xeen.cpp | |
| parent | a7bc08992e2acd361c485179d2142bc9121cda65 (diff) | |
| download | scummvm-rg350-caba18856914daac4339f040b39b7b73795c6310.tar.gz scummvm-rg350-caba18856914daac4339f040b39b7b73795c6310.tar.bz2 scummvm-rg350-caba18856914daac4339f040b39b7b73795c6310.zip | |
XEEN: Mode renamings, fix loading savegame during script dragging party
Diffstat (limited to 'engines/xeen/xeen.cpp')
| -rw-r--r-- | engines/xeen/xeen.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp index 1e15ec7792..371f437172 100644 --- a/engines/xeen/xeen.cpp +++ b/engines/xeen/xeen.cpp @@ -197,7 +197,8 @@ bool XeenEngine::canLoadGameStateCurrently() { } bool XeenEngine::canSaveGameStateCurrently() { - return _mode != MODE_COMBAT && _mode != MODE_STARTUP && (_map->mazeData()._mazeFlags & RESTRICTION_SAVE) == 0; + return _mode != MODE_COMBAT && _mode != MODE_STARTUP && _mode != MODE_SCRIPT_IN_PROGRESS + && (_map->mazeData()._mazeFlags & RESTRICTION_SAVE) == 0; } void XeenEngine::playGame() { @@ -243,7 +244,7 @@ void XeenEngine::play() { _combat->_moveMonsters = true; if (_mode == MODE_STARTUP) { - _mode = MODE_1; + _mode = MODE_INTERACTIVE; _screen->fadeIn(); } @@ -272,6 +273,8 @@ void XeenEngine::gameLoop() { _map->cellFlagLookup(_party->_mazePosition); if (_map->_currentIsEvent) { _gameMode = (GameMode)_scripts->checkEvents(); + if (isLoadPending()) + continue; if (shouldExit()) return; } |