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

[thebluegr at users.sourceforge.net]

Revision: 40094
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40094&view=rev
Author:   thebluegr
Date:     2009-04-23 19:11:01 +0000 (Thu, 23 Apr 2009)

Log Message:
-----------
Removed a FIXME concerning CanBeHere and CantBeHere and added an explanation. Also, removed some unused code.

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-04-23 18:46:41 UTC (rev 40093)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-04-23 19:11:01 UTC (rev 40094)
@@ -142,8 +142,9 @@
 	/*4e*/	DEFUN("ReadNumber", kReadNumber, "r"),
 	/*4f*/	DEFUN("BaseSetter", kBaseSetter, "o"),
 	/*50*/	DEFUN("DirLoop", kDirLoop, "oi"),
+	// Opcode 51 is defined twice for a reason. Older SCI versions
+	// call CanBeHere, whereas newer ones its inverse, CantBeHere
 	/*51*/	DEFUN("CanBeHere", kCanBeHere, "ol*"),
-	// FIXME: The number 0x51 occurs twice :-)
 	/*51*/	DEFUN("CantBeHere", kCanBeHere, "ol*"),
 	/*52*/	DEFUN("OnControl", kOnControl, "i*"),
 	/*53*/	DEFUN("InitBresen", kInitBresen, "oi*"),
@@ -173,13 +174,8 @@
 	/*6b*/	DEFUN("FlushResources", kFlushResources, "i"),
 	/*6c*/	DEFUN("TimesSin", kTimesSin, "ii"),
 	/*6d*/	DEFUN("TimesCos", kTimesCos, "ii"),
-#if 0
-	/*6e*/	NOFUN(NULL),
-	/*6f*/	NOFUN(NULL),
-#else
 	/*6e*/	DEFUN("6e", kTimesSin, "ii"),
 	/*6f*/	DEFUN("6f", kTimesCos, "ii"),
-#endif
 	/*70*/	DEFUN("Graph", kGraph, ".*"),
 	/*71*/	DEFUN("Joystick", kJoystick, ".*"),
 	/*72*/	NOFUN(NULL),


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