[Scummvm-cvs-logs] SF.net SVN: scummvm: [20486] scummvm/trunk/kyra
vinterstum at users.sourceforge.net
vinterstum at users.sourceforge.net
Fri Feb 10 17:34:01 CET 2006
Revision: 20486
Author: vinterstum
Date: 2006-02-10 17:32:22 -0800 (Fri, 10 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20486&view=rev
Log Message:
-----------
Possible fix for bug [ 1425622 ] KYRA: Assertion at final scene
Also fixes an uninitialized var.
Modified Paths:
--------------
scummvm/trunk/kyra/gui.cpp
scummvm/trunk/kyra/kyra.cpp
Modified: scummvm/trunk/kyra/gui.cpp
===================================================================
--- scummvm/trunk/kyra/gui.cpp 2006-02-11 00:48:31 UTC (rev 20485)
+++ scummvm/trunk/kyra/gui.cpp 2006-02-11 01:32:22 UTC (rev 20486)
@@ -798,6 +798,7 @@
gui_redrawTextfield();
_keyboardEvent.pending = 0;
+ _keyboardEvent.repeat = 0;
while (_displaySubMenu) {
gui_getInput();
gui_updateSavegameString();
Modified: scummvm/trunk/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/kyra/kyra.cpp 2006-02-11 00:48:31 UTC (rev 20485)
+++ scummvm/trunk/kyra/kyra.cpp 2006-02-11 01:32:22 UTC (rev 20486)
@@ -1314,7 +1314,7 @@
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 @@
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) {
More information about the Scummvm-git-logs
mailing list