[Scummvm-cvs-logs] SF.net SVN: scummvm:[42162] scummvm/trunk/engines/cruise

[dreammaster at users.sourceforge.net]

Revision: 42162
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42162&view=rev
Author:   dreammaster
Date:     2009-07-06 02:46:59 +0000 (Mon, 06 Jul 2009)

Log Message:
-----------
Bugfix for node enabling/disabling, which was previously allowing the player to walk through closed doors and into the walls

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/ctp.cpp
    scummvm/trunk/engines/cruise/function.cpp

Modified: scummvm/trunk/engines/cruise/ctp.cpp
===================================================================
--- scummvm/trunk/engines/cruise/ctp.cpp	2009-07-06 01:41:29 UTC (rev 42161)
+++ scummvm/trunk/engines/cruise/ctp.cpp	2009-07-06 02:46:59 UTC (rev 42162)
@@ -209,9 +209,9 @@
 	int oldState = walkboxState[nodeIdx];
 
 	if (nodeState == -1)
-		return
+		return oldState;
 
-		    walkboxState[nodeIdx] = nodeState;
+	walkboxState[nodeIdx] = nodeState;
 
 	return oldState;
 }

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2009-07-06 01:41:29 UTC (rev 42161)
+++ scummvm/trunk/engines/cruise/function.cpp	2009-07-06 02:46:59 UTC (rev 42162)
@@ -828,7 +828,7 @@
 }
 
 int16 Op_LoadCt(void) {
-	return initCt((char*)popPtr());
+	return initCt((const char *)popPtr());
 }
 
 int16 Op_EndAnim(void) {


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