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

[sev at users.sourceforge.net]

Revision: 52148
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52148&view=rev
Author:   sev
Date:     2010-08-17 11:01:20 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
M4: fix warnings

Modified Paths:
--------------
    scummvm/trunk/engines/m4/ws_machine.cpp
    scummvm/trunk/engines/m4/ws_sequence.cpp

Modified: scummvm/trunk/engines/m4/ws_machine.cpp
===================================================================
--- scummvm/trunk/engines/m4/ws_machine.cpp	2010-08-17 11:00:53 UTC (rev 52147)
+++ scummvm/trunk/engines/m4/ws_machine.cpp	2010-08-17 11:01:20 UTC (rev 52148)
@@ -157,12 +157,12 @@
 	_code->loadInstruction(instruction);
 
 	if (instruction.instr >= 64) {
-		if (machineConditionalsTable[instruction.instr - 64] != NULL)
+		if (machineConditionalsTable[instruction.instr - 64] != 0)
 			(this->*machineConditionalsTable[instruction.instr - 64])(instruction);
 		/* The next line is to yield on unimplemented opcodes */
 		else { fflush(stdout); g_system->delayMillis(5000); }
 	} else if (instruction.instr > 0) {
-		if (machineCommandsTable[instruction.instr] != NULL)
+		if (machineCommandsTable[instruction.instr] != 0)
 			done = !(this->*machineCommandsTable[instruction.instr])(instruction);
 		/* The next line is to yield on unimplemented opcodes */
 		else { fflush(stdout); g_system->delayMillis(5000); }

Modified: scummvm/trunk/engines/m4/ws_sequence.cpp
===================================================================
--- scummvm/trunk/engines/m4/ws_sequence.cpp	2010-08-17 11:00:53 UTC (rev 52147)
+++ scummvm/trunk/engines/m4/ws_sequence.cpp	2010-08-17 11:01:20 UTC (rev 52148)
@@ -226,7 +226,7 @@
 	while (!done) {
 		Instruction instruction;
 		_code->loadInstruction(instruction);
-		if (sequenceCommandsTable[instruction.instr] != NULL)
+		if (sequenceCommandsTable[instruction.instr] != 0)
 			done = !(this->*sequenceCommandsTable[instruction.instr])(instruction);
 		else { fflush(stdout); /*g_system->delayMillis(1000);*/ }
 	}


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