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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Jul 30 10:21:55 CEST 2010


Revision: 51500
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51500&view=rev
Author:   m_kiewitz
Date:     2010-07-30 08:21:54 +0000 (Fri, 30 Jul 2010)

Log Message:
-----------
SCI: cleaning up kSetCursor

showing warning about unsupported mag-cursor when argc = 10 is used
removing argc = 9 support, must have been a script bug somewhere

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel_tables.h
    scummvm/trunk/engines/sci/engine/kgraphics.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel_tables.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-30 07:11:57 UTC (rev 51499)
+++ scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-30 08:21:54 UTC (rev 51500)
@@ -418,7 +418,8 @@
     { MAP_CALL(ScriptID),          SIG_EVERYWHERE,           "[io](i)",               NULL,            NULL },
     { MAP_CALL(SetCursor),         SIG_SCI21, SIGFOR_ALL,    "i(i)([io])(i*)",        NULL,            NULL },
     // TODO: SCI2.1 may supply an object optionally (mother goose sci21 right on startup) - find out why
-    { MAP_CALL(SetCursor),         SIG_EVERYWHERE,           "i(i*)",                 NULL,            NULL },
+    { MAP_CALL(SetCursor),         SIG_SCI11, SIGFOR_ALL,    "i(i)(i)(i)(iiiiii)",    NULL,            NULL },
+    { MAP_CALL(SetCursor),         SIG_EVERYWHERE,           "i(i)(i)(i)(i)",         NULL,            NULL },
     { MAP_CALL(SetDebug),          SIG_EVERYWHERE,           "(i*)",                  NULL,            NULL },
     { MAP_CALL(SetJump),           SIG_EVERYWHERE,           "oiii",                  NULL,            NULL },
     { MAP_CALL(SetMenu),           SIG_EVERYWHERE,           "i(.*)",                 NULL,            NULL },

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-30 07:11:57 UTC (rev 51499)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-30 08:21:54 UTC (rev 51500)
@@ -173,13 +173,6 @@
 		break;
 	}
 	case 5:
-	case 9:
-	case 10:	// Freddy Pharkas, when using the whiskey glass to read
-				// the prescription (bug #3034973) - looks like an erroneous
-				// extra param
-		// TODO: We don't really use parameter indices 5-9 (with no side
-		// effects), are they used for something, or are these a result of
-		// script bugs?
 		hotspot = new Common::Point(argv[3].toSint16(), argv[4].toSint16());
 		// Fallthrough
 	case 3:
@@ -188,6 +181,11 @@
 		else
 			g_sci->_gfxCursor->kernelSetView(argv[0].toUint16(), argv[1].toUint16(), argv[2].toUint16(), hotspot);
 		break;
+	case 10:
+		// Freddy pharkas, when using the whiskey glass to read the prescription (bug #3034973)
+		// magnifier support, disabled using argc == 1, argv == -1
+		warning("kSetCursor: unsupported magnifier");
+		break;
 	default :
 		error("kSetCursor: Unhandled case: %d arguments given", argc);
 		break;


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