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

[thebluegr at users.sourceforge.net]

Revision: 45010
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45010&view=rev
Author:   thebluegr
Date:     2009-10-13 09:33:57 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
Fixed a bug in the graphics function detection code, and corrected the location of the static "overlay" selector in SCI0 games. Fixes the demo of lsl3

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

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2009-10-13 09:29:58 UTC (rev 45009)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2009-10-13 09:33:57 UTC (rev 45010)
@@ -574,9 +574,9 @@
 											offset += 2;
 										}
 
-										argc = scr[offset++];
+										if (opcode == op_callk) {
+											argc = scr[offset++];
 
-										if (opcode == op_callk) {
 											if (kFuncNum == 8) {	// kDrawPic
 												// If kDrawPic is called with 6 parameters from the
 												// overlay selector, the game is using old graphics functions.

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-10-13 09:29:58 UTC (rev 45009)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-10-13 09:33:57 UTC (rev 45010)
@@ -65,7 +65,7 @@
 static const SelectorRemap sci0SelectorRemap[] = {
     {       "caller", 119 }, {          "cue", 121 }, {        "owner", 130 },
 	{    "completed", 159 }, {       "cycler", 164 }, {     "moveDone", 170 },
-	{     "distance", 173 }, {    "setCursor", 254 }, {      "overlay", 302 },
+	{     "distance", 173 }, {    "setCursor", 254 }, {      "overlay", 270 },
 	{      "points",  316 }, {        "flags", 368 }, {              0,   0 }
 };
 


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