diff options
author | Johannes Schickel | 2009-01-21 15:36:31 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-01-21 15:36:31 +0000 |
commit | d3fb5c1ecc9407c1ed70e2e54192a69189e92a4c (patch) | |
tree | 51535afb4c800da03dcd8104300c8348c11a4157 | |
parent | ceefbd19b97fe50c2a3721c303fcd087f2762b5b (diff) | |
download | scummvm-rg350-d3fb5c1ecc9407c1ed70e2e54192a69189e92a4c.tar.gz scummvm-rg350-d3fb5c1ecc9407c1ed70e2e54192a69189e92a4c.tar.bz2 scummvm-rg350-d3fb5c1ecc9407c1ed70e2e54192a69189e92a4c.zip |
Fixed GMM save/load functionallity in kyra1.
svn-id: r35980
-rw-r--r-- | engines/kyra/kyra_lok.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_v1.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index b228deb55c..700b0502b7 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -476,7 +476,9 @@ void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) { updateMousePointer(); } + _isSaveAllowed = isMainLoop; updateInput(); + _isSaveAllowed = false; if (_currentCharacter && _currentCharacter->sceneId == 210 && update) updateKyragemFading(); diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index eb0f929096..fbbaf7272a 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -226,11 +226,8 @@ void KyraEngine_v1::setMousePos(int x, int y) { int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop) { debugC(9, kDebugLevelMain, "KyraEngine_v1::checkInput(%p, %d)", (const void*)buttonList, mainLoop); - if (mainLoop) - _isSaveAllowed = true; - + _isSaveAllowed = mainLoop; updateInput(); - _isSaveAllowed = false; int keys = 0; |