diff options
| author | Borja Lorente | 2016-08-15 12:45:21 +0200 |
|---|---|---|
| committer | Borja Lorente | 2016-08-19 16:30:23 +0200 |
| commit | 9c0777efbf5a59df90728087276245208c13988f (patch) | |
| tree | 7fc9536bdd0cc78fd3a472ae32ef0a15adf84f8f /engines/macventure/script.cpp | |
| parent | 09fe00eb2a8f11e274901a4af4e19ec5275ff7e8 (diff) | |
| download | scummvm-rg350-9c0777efbf5a59df90728087276245208c13988f.tar.gz scummvm-rg350-9c0777efbf5a59df90728087276245208c13988f.tar.bz2 scummvm-rg350-9c0777efbf5a59df90728087276245208c13988f.zip | |
MACVENTURE: Fix some compiler warnings
Diffstat (limited to 'engines/macventure/script.cpp')
| -rw-r--r-- | engines/macventure/script.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/macventure/script.cpp b/engines/macventure/script.cpp index 3dc9509555..c743e49a55 100644 --- a/engines/macventure/script.cpp +++ b/engines/macventure/script.cpp @@ -119,7 +119,7 @@ bool ScriptEngine::execFrame(bool execAll) { } } - uint highest = 0; + int highest = 0; uint localHigh = 0; do { // Saved function calls highest = 0; @@ -914,6 +914,7 @@ bool ScriptEngine::opbbFORK(EngineState * state, EngineFrame * frame) { if (execFrame(true)) { return true; } + return false; } bool ScriptEngine::opbcCALL(EngineState * state, EngineFrame * frame, ScriptAsset &script) { @@ -926,6 +927,7 @@ bool ScriptEngine::opbcCALL(EngineState * state, EngineFrame * frame, ScriptAsse frame->scripts.pop_front(); script = frame->scripts.front(); debugC(2, kMVDebugScript, "SCRIPT: Return from fuction %d", id); + return false; } void ScriptEngine::opbdFOOB(EngineState * state, EngineFrame * frame) { @@ -1072,9 +1074,9 @@ void ScriptEngine::opd4RELC(EngineState * state, EngineFrame * frame) { void ScriptEngine::opd5DLOG(EngineState * state, EngineFrame * frame) { word txt = state->pop(); if (_engine->showTextEntry(txt, frame->src, frame->dest)) { - state->push(0xFFFF); + state->push(0xFF); } else { - state->push(0x0000); + state->push(0x00); } } |