[Scummvm-cvs-logs] SF.net SVN: scummvm:[50287] scummvm/trunk/engines/sci/engine/vm.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Jun 25 22:46:08 CEST 2010


Revision: 50287
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50287&view=rev
Author:   m_kiewitz
Date:     2010-06-25 20:46:08 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
SCI: adding workaround for uninitialized read in sq1

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-06-25 20:26:54 UTC (rev 50286)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-06-25 20:46:08 UTC (rev 50287)
@@ -191,13 +191,14 @@
 };
 
 static const UninitializedReadWorkaround uninitializedReadWorkarounds[] = {
-	{ GID_LAURABOW2,      24,    "gcWin", "open",		 5, 0xf }, // is used as priority for game menu
-	{ GID_FREDDYPHARKAS,  24,    "gcWin", "open",		 5, 0xf }, // is used as priority for game menu
-	{ GID_FREDDYPHARKAS,  31,  "quitWin", "open",		 5, 0xf }, // is used as priority for game menu
-	{ GID_LSL1,          720,    "rm720", "init",		 0,   0 }, // age check room
-	{ GID_ISLANDBRAIN,   140,    "piece", "init",		 3,   1 }, // some initialization variable. bnt is done on it, and it should be non-0
-	{ GID_SQ4,           928, "Narrator", "startText", 1000,   1 }, // sq4cd: method returns this to the caller
-	{ (SciGameId)0,       -1,       NULL,   NULL,		 0,   0 }
+	{ GID_LAURABOW2,      24,       "gcWin", "open",         5, 0xf }, // is used as priority for game menu
+	{ GID_FREDDYPHARKAS,  24,       "gcWin", "open",         5, 0xf }, // is used as priority for game menu
+	{ GID_FREDDYPHARKAS,  31,     "quitWin", "open",         5, 0xf }, // is used as priority for game menu
+	{ GID_LSL1,          720,       "rm720", "init",         0,   0 }, // age check room
+	{ GID_ISLANDBRAIN,   140,       "piece", "init",         3,   1 }, // some initialization variable. bnt is done on it, and it should be non-0
+	{ GID_SQ1,           703, "fromAirlock", "<invalid>",    0,   0 }, // sub that's called from fromAirlock::changeState
+	{ GID_SQ4,           928,    "Narrator", "startText", 1000,   1 }, // sq4cd: method returns this to the caller
+	{ (SciGameId)0,       -1,          NULL, NULL,           0,   0 }
 };
 
 static reg_t validate_read_var(reg_t *r, reg_t *stack_base, int type, int max, int index, int line, reg_t default_value) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list