diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/m4/ws_machine.cpp | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/m4/ws_machine.cpp')
| -rw-r--r-- | engines/m4/ws_machine.cpp | 4 |
1 files changed, 2 insertions, 2 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); } |