diff options
| author | uruk | 2014-07-29 16:41:56 +0200 |
|---|---|---|
| committer | uruk | 2014-07-29 16:41:56 +0200 |
| commit | 4e32736e44a7bd90e34608d2ec7764b2ed260f52 (patch) | |
| tree | 7f6b7b2ae14e355d7809295c08ce0210b7df2f58 /engines/cge2/saveload.cpp | |
| parent | fc8f6d9cfef1345774ef3dc4a0193033597a4b04 (diff) | |
| download | scummvm-rg350-4e32736e44a7bd90e34608d2ec7764b2ed260f52.tar.gz scummvm-rg350-4e32736e44a7bd90e34608d2ec7764b2ed260f52.tar.bz2 scummvm-rg350-4e32736e44a7bd90e34608d2ec7764b2ed260f52.zip | |
CGE2: Prevent the engine from entering an endless loop when loading.
Also remove CommandHandler::reset(), since it's not useful anymore.
Diffstat (limited to 'engines/cge2/saveload.cpp')
| -rw-r--r-- | engines/cge2/saveload.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/cge2/saveload.cpp b/engines/cge2/saveload.cpp index 652dbea1ec..b984a48e57 100644 --- a/engines/cge2/saveload.cpp +++ b/engines/cge2/saveload.cpp @@ -317,6 +317,8 @@ void CGE2Engine::syncHeader(Common::Serializer &s) { } Common::Error CGE2Engine::loadGameState(int slot) { + _commandHandler->clear(); + _commandHandlerTurbo->clear(); sceneDown(); if (!loadGame(slot)) return Common::kReadingFailed; @@ -329,7 +331,6 @@ void CGE2Engine::resetGame() { busy(false); _spare->clear(); _vga->_showQ->clear(); - _commandHandler->reset(); loadScript("CGE.INI", true); delete _infoLine; _infoLine = new InfoLine(this, kInfoW); |