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

[thebluegr at users.sourceforge.net]

Revision: 46011
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46011&view=rev
Author:   thebluegr
Date:     2009-11-20 15:31:08 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Removed more unused selectors - the canBeHere selector is replaced by cantBeHere in SCI1+

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

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-11-20 15:17:14 UTC (rev 46010)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2009-11-20 15:31:08 UTC (rev 46011)
@@ -70,16 +70,16 @@
 // Taken from Leisure Suit Larry 1 VGA (Full Game)
 static const SelectorRemap sci1SelectorRemap[] = {
 	{      "nodePtr",  44 }, {   "cantBeHere",  57 }, {    "topString", 101 },
-	{        "flags", 102 }, {    "setCursor", 183 }, {    "canBeHere", 232 },
-	{     "syncTime", 247 }, {      "syncCue", 248 }, {              0,   0 }
+	{        "flags", 102 }, {    "setCursor", 183 }, {     "syncTime", 247 },
+	{      "syncCue", 248 }, {              0,   0 }
 };
 
 // Taken from KQ6 floppy (Full Game)
 static const SelectorRemap sci11SelectorRemap[] = {
 	{      "nodePtr",  41 }, {   "cantBeHere",  54 }, {     "topString", 98 },
 	{        "flags",  99 }, {       "scaleX", 104 }, {       "scaleY", 105 },
-	{    "setCursor", 197 }, {    "canBeHere", 264 }, {     "syncTime", 279 },
-	{      "syncCue", 280 }, {              0,   0 }
+	{    "setCursor", 197 }, {     "syncTime", 279 }, {      "syncCue", 280 },
+	{              0,   0 }
 };
 
 Common::StringList Kernel::checkStaticSelectorNames() {

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2009-11-20 15:17:14 UTC (rev 46010)
+++ scummvm/trunk/engines/sci/engine/vm.h	2009-11-20 15:31:08 UTC (rev 46011)
@@ -146,7 +146,7 @@
 	Selector b_movCnt, b_i1, b_i2, b_di, b_xAxis, b_incr; // Various Bresenham vars
 	Selector xStep, yStep; // BR adjustments
 	Selector moveSpeed; // Used for DoBresen
-	Selector canBeHere; // Funcselector: Checks for movement validity
+	Selector canBeHere; // Funcselector: Checks for movement validity in SCI0
 	Selector heading, mover; // Used in DoAvoider
 	Selector doit; // Called (!) by the Animate() system call
 	Selector isBlocked, looper;	// Used in DoAvoider
@@ -180,7 +180,7 @@
 	Selector moveDone;	// used for DoBresen
 
 	// SCI1 selectors which have been moved a bit in SCI1.1, but otherwise static
-	Selector cantBeHere;
+	Selector cantBeHere; // Checks for movement avoidance in SCI1+. Replaces canBeHere
 	Selector topString; // SCI1 scroll lists use this instead of lsTop
 	Selector flags;
 


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