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

[mthreepwood at users.sourceforge.net]

Revision: 47011
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47011&view=rev
Author:   mthreepwood
Date:     2010-01-05 01:51:09 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Fix walking in SCI32. Gabriel now will walk and DrMcCoy can now hear his precious 'Gabriel is a lout' line :P

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

Modified: scummvm/trunk/engines/sci/engine/kernel32.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel32.cpp	2010-01-05 01:47:44 UTC (rev 47010)
+++ scummvm/trunk/engines/sci/engine/kernel32.cpp	2010-01-05 01:51:09 UTC (rev 47011)
@@ -142,7 +142,7 @@
 	/*0x68*/ "Platform",
 	/*0x69*/ "BaseSetter",
 	/*0x6a*/ "DirLoop",
-	/*0x6b*/ "CanBeHere",
+	/*0x6b*/ "CantBeHere",
 	/*0x6c*/ "InitBresen",
 	/*0x6d*/ "DoBresen",
 	/*0x6e*/ "SetJump",
@@ -296,7 +296,7 @@
 	/*0x5d*/ "FileIO",
 	/*0x5e*/ "BaseSetter",
 	/*0x5f*/ "DirLoop",
-	/*0x60*/ "CanBeHere",
+	/*0x60*/ "CantBeHere",
 	/*0x61*/ "InitBresen",
 	/*0x62*/ "DoBresen",
 	/*0x63*/ "SetJump",

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2010-01-05 01:47:44 UTC (rev 47010)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2010-01-05 01:51:09 UTC (rev 47011)
@@ -375,9 +375,9 @@
 						break;
 					case kDetectMoveCountType:
 						// Games which ignore move count call kAbs before calling kDoBresen
-						if (kFuncNum == 61) {	// kAbs (SCI1)
+						if (_kernel->getKernelName(kFuncNum) == "Abs") {
 							foundTarget = true;
-						} else if (kFuncNum == 80) {	// kDoBresen (SCI1)
+						} else if (_kernel->getKernelName(kFuncNum) == "DoBresen") {
 							_moveCountType = foundTarget ? kIgnoreMoveCount : kIncrementMoveCount;
 							return true;
 						}


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