diff options
| author | Oystein Eftevaag | 2006-02-11 01:32:22 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-02-11 01:32:22 +0000 |
| commit | ebb5564a5791948bc8cc50f1766c1fc1352670fe (patch) | |
| tree | d902836cefc600a89a0a70c405eac8c462423555 | |
| parent | 44763fcce90a9ccfb40d1430e015b45546f08569 (diff) | |
| download | scummvm-rg350-ebb5564a5791948bc8cc50f1766c1fc1352670fe.tar.gz scummvm-rg350-ebb5564a5791948bc8cc50f1766c1fc1352670fe.tar.bz2 scummvm-rg350-ebb5564a5791948bc8cc50f1766c1fc1352670fe.zip | |
Possible fix for bug [ 1425622 ] KYRA: Assertion at final scene
Also fixes an uninitialized var.
svn-id: r20486
| -rw-r--r-- | kyra/gui.cpp | 1 | ||||
| -rw-r--r-- | kyra/kyra.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kyra/gui.cpp b/kyra/gui.cpp index 296f46b04e..8e98f8a9a6 100644 --- a/kyra/gui.cpp +++ b/kyra/gui.cpp @@ -798,6 +798,7 @@ int KyraEngine::gui_saveGame(Button *button) { gui_redrawTextfield(); _keyboardEvent.pending = 0; + _keyboardEvent.repeat = 0; while (_displaySubMenu) { gui_getInput(); gui_updateSavegameString(); diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index dcdd281d92..b96273b2bc 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -1314,7 +1314,7 @@ int KyraEngine::handleBeadState() { static const int table1[] = { -1, -2, -4, -5, -6, -7, -6, -5, -4, -2, -1, 0, 1, 2, 4, 5, - 6, 7, 6, 5, 4, 2, 1, 0 + 6, 7, 6, 5, 4, 2, 1, 0, 0 }; static const int table2[] = { 0, 0, 1, 1, 2, 2, 3, 3, @@ -1322,7 +1322,7 @@ int KyraEngine::handleBeadState() { 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0 }; switch (_beadStateVar) { |