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

[mthreepwood at users.sourceforge.net]

Revision: 51429
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51429&view=rev
Author:   mthreepwood
Date:     2010-07-28 17:45:19 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
SCI: Set the LB2 floppy open selector so we don't have to have duplicate workaround entries

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

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-07-28 17:39:47 UTC (rev 51428)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-07-28 17:45:19 UTC (rev 51429)
@@ -175,6 +175,13 @@
 				names.resize(111);
 
 			names[110] = "init";
+		} else if (g_sci->getGameId() == GID_LAURABOW2) {
+			// The floppy of version needs the open selector set to match up with the CD version's
+			// workaround - bug #3035694
+			if (names.size() < 190)
+				names.resize(190);
+
+			names[189] = "open";
 		}
 
 #ifdef ENABLE_SCI32

Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-28 17:39:47 UTC (rev 51428)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-28 17:45:19 UTC (rev 51429)
@@ -86,7 +86,6 @@
 	{ GID_KQ7,            30, 64996,  0,               "User", "handleEvent",    -1,    1, { WORKAROUND_FAKE,   0 } }, // called when pushing a keyboard key
 	{ GID_LAURABOW,       44,   967,  0,             "myIcon", "cycle",          -1,    1, { WORKAROUND_FAKE,   0 } }, // second dialog box after the intro, when talking with Lillian - bug #3034985
 	{ GID_LAURABOW2,      -1,    24,  0,              "gcWin", "open",           -1,    5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
-	{ GID_LAURABOW2,      -1,    24,  0,              "gcWin", "<noname 189>",   -1,    5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu (floppy version, which doesn't have a selector vocabulary) - bug #3035694
 	{ GID_LAURABOW2,     230,    21,  0,      "dropCluesCode", "doit",           -1,    1, { WORKAROUND_FAKE,   0 } }, // when asking the reporter about the burglary - bug #3035068
 	{ GID_LSL1,          250,   250,  0,           "increase", "handleEvent",    -1,    2, { WORKAROUND_FAKE,   0 } }, // casino, playing game, increasing bet
 	{ GID_LSL1,          720,   720,  0,              "rm720", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // age check room


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