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

[thebluegr at users.sourceforge.net]

Revision: 50567
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50567&view=rev
Author:   thebluegr
Date:     2010-07-01 20:16:42 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
SCI: Mark the ShiftScreen, ListOps and ATan SCI1 kernel functions as unused (dummy) - we haven't seen them being used anywhere. Added a check and an error in case a kernel function which is considered to be unused is called.

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-01 19:41:50 UTC (rev 50566)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-01 20:16:42 UTC (rev 50567)
@@ -170,18 +170,18 @@
 	/*0x6c*/ "Graph",
 	/*0x6d*/ "Joystick",
 	// End of kernel function table for SCI0
-	/*0x6e*/ "ShiftScreen",
+	/*0x6e*/ "Dummy",	// ShiftScreen
 	/*0x6f*/ "Palette",
 	/*0x70*/ "MemorySegment",
 	/*0x71*/ "Intersections",	// MoveCursor (SCI1 late), PalVary (SCI1.1)
 	/*0x72*/ "Memory",
-	/*0x73*/ "ListOps",
+	/*0x73*/ "Dummy",	// ListOps
 	/*0x74*/ "FileIO",
 	/*0x75*/ "DoAudio",
 	/*0x76*/ "DoSync",
 	/*0x77*/ "AvoidPath",
 	/*0x78*/ "Sort",	// StrSplit (SCI01)
-	/*0x79*/ "ATan",
+	/*0x79*/ "Dummy",	// ATan
 	/*0x7a*/ "Lock",
 	/*0x7b*/ "StrSplit",
 	/*0x7c*/ "GetMessage",	// Message (SCI1.1)
@@ -429,17 +429,6 @@
 #endif
 };
 
-#if 0
-	// Stub functions
-	/*09*/	{ "Show", kShow, "i" },
-	{ "ShiftScreen", kShiftScreen, ".*" },
-	{ "ListOps", kListOps, ".*" },
-	{ "ATan", kATan, ".*" },
-	{ "Record", kRecord, ".*" },
-	{ "PlayBack", kPlayBack, ".*" },
-	{ "DbugStr", kDbugStr, ".*" },
-#endif
-
 Kernel::Kernel(ResourceManager *resMan, SegManager *segMan)
 	: _resMan(resMan), _segMan(segMan), _invalid("<invalid>") {
 	loadSelectorNames();

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-01 19:41:50 UTC (rev 50566)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-01 20:16:42 UTC (rev 50567)
@@ -852,6 +852,11 @@
 		}
 
 		warning("%s", warningMsg.c_str());
+
+		// Make sure that the game doesn't call a function that is considered unused. If
+		// that happens, error out.
+		if (kernelCall.origName == "Dummy")
+			error("Kernel function %d was called, which was considered to be unused", kernelFuncNr);
 	}
 }
 


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