aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-17 11:01:20 +0000
committerEugene Sandulenko2010-08-17 11:01:20 +0000
commitee23fe34b07effcf394ca43044270af0e2ebd4af (patch)
treeda62b3a8c9162f38610fe7ba9fece8f6b041f1bc
parent4d64004aa7897ca99299a6154c99e3ada350b9d3 (diff)
downloadscummvm-rg350-ee23fe34b07effcf394ca43044270af0e2ebd4af.tar.gz
scummvm-rg350-ee23fe34b07effcf394ca43044270af0e2ebd4af.tar.bz2
scummvm-rg350-ee23fe34b07effcf394ca43044270af0e2ebd4af.zip
M4: fix warnings
svn-id: r52148
-rw-r--r--engines/m4/ws_machine.cpp4
-rw-r--r--engines/m4/ws_sequence.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/ws_machine.cpp b/engines/m4/ws_machine.cpp
index 985ceedb2e..cb791026c9 100644
--- a/engines/m4/ws_machine.cpp
+++ b/engines/m4/ws_machine.cpp
@@ -157,12 +157,12 @@ int32 Machine::execInstruction() {
_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); }
diff --git a/engines/m4/ws_sequence.cpp b/engines/m4/ws_sequence.cpp
index 1f3c977609..79869a81d0 100644
--- a/engines/m4/ws_sequence.cpp
+++ b/engines/m4/ws_sequence.cpp
@@ -226,7 +226,7 @@ bool Sequence::runProgram() {
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);*/ }
}