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

[fingolfin at users.sourceforge.net]

Revision: 28308
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28308&view=rev
Author:   fingolfin
Date:     2007-07-29 10:37:08 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
Fixed some warnings

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/scene_v2.cpp
    scummvm/trunk/engines/kyra/script_v2.cpp
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/trunk/engines/kyra/scene_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v2.cpp	2007-07-29 17:33:17 UTC (rev 28307)
+++ scummvm/trunk/engines/kyra/scene_v2.cpp	2007-07-29 17:37:08 UTC (rev 28308)
@@ -689,11 +689,13 @@
 	x &= ~3; toX &= ~3;
 	y &= ~1; toY &= ~1;
 	int size = KyraEngine::findWay(x, y, toX, toY, moveTable, moveTableSize);
-	/*if (size) {
+	if (size) {
+/*
 		int temp = pathfinderUnk1(moveTable);
 		temp = pathfinderUnk3(temp, x, y);
 		pathfinderUnk5(moveTable, temp, x, y, moveTableSize);
-	}*/
+*/
+	}
 	return getMoveTableSize(moveTable);
 }
 

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2007-07-29 17:33:17 UTC (rev 28307)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2007-07-29 17:37:08 UTC (rev 28308)
@@ -281,7 +281,7 @@
 }
 
 int KyraEngine_v2::o2_restoreBackBuffer(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "o2_restoreBackBuffer(%p) (%d, %d)", (const void *)script, stackPos(0));
+	debugC(3, kDebugLevelScriptFuncs, "o2_restoreBackBuffer(%p) (%d)", (const void *)script, stackPos(0));
 	int disable = stackPos(0);
 	int oldState = 0;
 	if (disable) {

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-07-29 17:33:17 UTC (rev 28307)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-07-29 17:37:08 UTC (rev 28308)
@@ -70,7 +70,7 @@
 
 void Parallaction_ns::callFunction(uint index, void* parm) {
 	printf("index = %i\n", index);
-	assert(index >= 0 && index < 25);	// magic value 25 is maximum # of callables for Nippon Safes
+	assert(index < 25);	// magic value 25 is maximum # of callables for Nippon Safes
 
 	(this->*_callables[index])(parm);
 }


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