diff options
| author | Max Horn | 2009-03-07 19:24:31 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-07 19:24:31 +0000 |
| commit | f9ecd95d6960341e696ab1aa8262e48135908d51 (patch) | |
| tree | 4ab853891a0ca47c4d46a2691546e27a7e05b7f9 /engines/m4 | |
| parent | 2dfae035ac7351b1161d0466405c1d44d69f701a (diff) | |
| download | scummvm-rg350-f9ecd95d6960341e696ab1aa8262e48135908d51.tar.gz scummvm-rg350-f9ecd95d6960341e696ab1aa8262e48135908d51.tar.bz2 scummvm-rg350-f9ecd95d6960341e696ab1aa8262e48135908d51.zip | |
Whitespace cleanup: Convert space followed by tab to just tab
svn-id: r39203
Diffstat (limited to 'engines/m4')
| -rw-r--r-- | engines/m4/burger_data.h | 4 | ||||
| -rw-r--r-- | engines/m4/globals.h | 12 | ||||
| -rw-r--r-- | engines/m4/script.cpp | 2 | ||||
| -rw-r--r-- | engines/m4/ws_machine.cpp | 20 |
4 files changed, 19 insertions, 19 deletions
diff --git a/engines/m4/burger_data.h b/engines/m4/burger_data.h index 000d0a9654..c053268705 100644 --- a/engines/m4/burger_data.h +++ b/engines/m4/burger_data.h @@ -32,7 +32,7 @@ namespace M4 { InventoryObject burger_inventory [] = { - // name scene icon + // name scene icon //-------------------- ----- ----- { "empty jug", 303, 14 }, { "distilled juice", 999, 15 }, @@ -41,7 +41,7 @@ InventoryObject burger_inventory [] = { { "broken mouse trap", 999, 18 }, { "mouse trap", 999, 19 }, { "kindling", 999, 20 }, - { "burning kindling", 999, 21 }, + { "burning kindling", 999, 21 }, { "lights", 508, 22 }, { "lights on", 508, 23 }, { "bottle", 999, 24 }, diff --git a/engines/m4/globals.h b/engines/m4/globals.h index ec32c29fda..aaf05fb94f 100644 --- a/engines/m4/globals.h +++ b/engines/m4/globals.h @@ -79,12 +79,12 @@ enum WoodScriptGlobals { kGlobTemp32 = 38 }; -const uint32 SERIES_FORWARD = 0; -const uint32 SERIES_PINGPONG = 1; -const uint32 SERIES_BACKWARD = 2; -const uint32 SERIES_RANDOM = 4; -const uint32 SERIES_NO_TOSS = 8; -const uint32 SERIES_STICK = 16; +const uint32 SERIES_FORWARD = 0; +const uint32 SERIES_PINGPONG = 1; +const uint32 SERIES_BACKWARD = 2; +const uint32 SERIES_RANDOM = 4; +const uint32 SERIES_NO_TOSS = 8; +const uint32 SERIES_STICK = 16; const uint32 SERIES_LOOP_TRIGGER = 32; const uint32 SERIES_LOAD_PALETTE = 64; const uint32 SERIES_HORZ_FLIP =128; diff --git a/engines/m4/script.cpp b/engines/m4/script.cpp index 439c111ce9..243f073403 100644 --- a/engines/m4/script.cpp +++ b/engines/m4/script.cpp @@ -556,7 +556,7 @@ void ScriptInterpreter::callKernelFunction(uint32 index) { int args = (this->*(_kernelFunctions[index].proc))(); // Now remove values from the stack if the function used any - if (args > 4) + if (args > 4) _stackPtr -= args - 4; printf("-------------\n"); diff --git a/engines/m4/ws_machine.cpp b/engines/m4/ws_machine.cpp index 0410f29f5b..985ceedb2e 100644 --- a/engines/m4/ws_machine.cpp +++ b/engines/m4/ws_machine.cpp @@ -34,16 +34,16 @@ bool (Machine::*machineCommandsTable[])(Instruction &instruction) = { &Machine::m1_jump, &Machine::m1_terminate, &Machine::m1_startSequence, - &Machine::m1_pauseSequence, - &Machine::m1_resumeSequence, - &Machine::m1_storeValue, - &Machine::m1_sendMessage, - &Machine::m1_broadcastMessage, - &Machine::m1_replyMessage, - &Machine::m1_sendSystemMessage, - &Machine::m1_createMachine, - &Machine::m1_createMachineEx, - &Machine::m1_clearVars + &Machine::m1_pauseSequence, + &Machine::m1_resumeSequence, + &Machine::m1_storeValue, + &Machine::m1_sendMessage, + &Machine::m1_broadcastMessage, + &Machine::m1_replyMessage, + &Machine::m1_sendSystemMessage, + &Machine::m1_createMachine, + &Machine::m1_createMachineEx, + &Machine::m1_clearVars }; void (Machine::*machineConditionalsTable[])(Instruction &instruction) = { |