diff options
| author | Walter van Niftrik | 2016-03-18 23:50:24 +0100 |
|---|---|---|
| committer | Walter van Niftrik | 2016-06-06 20:35:49 +0200 |
| commit | d8035140e2a0d4210cd77e4b24fe3430aacc6ea2 (patch) | |
| tree | 387a59790acb6aba3660b5f587726a28fcdaa5f6 /engines | |
| parent | d09247bacaea68af05703218373479cdb0f558bd (diff) | |
| download | scummvm-rg350-d8035140e2a0d4210cd77e4b24fe3430aacc6ea2.tar.gz scummvm-rg350-d8035140e2a0d4210cd77e4b24fe3430aacc6ea2.tar.bz2 scummvm-rg350-d8035140e2a0d4210cd77e4b24fe3430aacc6ea2.zip | |
ADL: Clean up opcodes
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/adl/adl.cpp | 42 | ||||
| -rw-r--r-- | engines/adl/adl.h | 6 | ||||
| -rw-r--r-- | engines/adl/adl_v2.cpp | 18 |
3 files changed, 33 insertions, 33 deletions
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp index 036e8f1049..e6ce0f65e3 100644 --- a/engines/adl/adl.cpp +++ b/engines/adl/adl.cpp @@ -295,12 +295,12 @@ void AdlEngine::setupOpcodeTables() { // 0x04 OpcodeUnImpl(); Opcode(o1_isMovesGT); - Opcode(o1_isVarEq); + Opcode(o1_isVarEQ); OpcodeUnImpl(); // 0x08 OpcodeUnImpl(); - Opcode(o1_isCurPicEq); - Opcode(o1_isItemPicEq); + Opcode(o1_isCurPicEQ); + Opcode(o1_isItemPicEQ); SetOpcodeTable(_actOpcodes); // 0x00 @@ -854,33 +854,33 @@ void AdlEngine::getInput(uint &verb, uint &noun) { typedef Common::Functor1Mem<ScriptEnv &, int, AdlEngine> OpcodeV1; int AdlEngine::o1_isItemInRoom(ScriptEnv &e) { - if (getItem(e.arg(1)).room != e.arg(2)) - return -1; - return 2; + if (getItem(e.arg(1)).room == e.arg(2)) + return 2; + return -1; } int AdlEngine::o1_isMovesGT(ScriptEnv &e) { - if (e.arg(1) >= _state.moves) - return -1; - return 1; + if (_state.moves > e.arg(1)) + return 1; + return -1; } -int AdlEngine::o1_isVarEq(ScriptEnv &e) { - if (getVar(e.arg(1)) != e.arg(2)) - return -1; - return 2; +int AdlEngine::o1_isVarEQ(ScriptEnv &e) { + if (getVar(e.arg(1)) == e.arg(2)) + return 2; + return -1; } -int AdlEngine::o1_isCurPicEq(ScriptEnv &e) { - if (getCurRoom().curPicture != e.arg(1)) - return -1; - return 1; +int AdlEngine::o1_isCurPicEQ(ScriptEnv &e) { + if (getCurRoom().curPicture == e.arg(1)) + return 1; + return -1; } -int AdlEngine::o1_isItemPicEq(ScriptEnv &e) { - if (getItem(e.arg(1)).picture != e.arg(2)) - return -1; - return 2; +int AdlEngine::o1_isItemPicEQ(ScriptEnv &e) { + if (getItem(e.arg(1)).picture == e.arg(2)) + return 2; + return -1; } int AdlEngine::o1_varAdd(ScriptEnv &e) { diff --git a/engines/adl/adl.h b/engines/adl/adl.h index b6e8dfac59..d13e122181 100644 --- a/engines/adl/adl.h +++ b/engines/adl/adl.h @@ -179,9 +179,9 @@ protected: // Opcodes int o1_isItemInRoom(ScriptEnv &e); int o1_isMovesGT(ScriptEnv &e); - int o1_isVarEq(ScriptEnv &e); - int o1_isCurPicEq(ScriptEnv &e); - int o1_isItemPicEq(ScriptEnv &e); + int o1_isVarEQ(ScriptEnv &e); + int o1_isCurPicEQ(ScriptEnv &e); + int o1_isItemPicEQ(ScriptEnv &e); int o1_varAdd(ScriptEnv &e); int o1_varSub(ScriptEnv &e); diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp index 1e5553a22a..4ef2ae27df 100644 --- a/engines/adl/adl_v2.cpp +++ b/engines/adl/adl_v2.cpp @@ -52,12 +52,12 @@ void AdlEngine_v2::setupOpcodeTables() { // 0x04 Opcode(o2_isNounNotInRoom); Opcode(o1_isMovesGT); - Opcode(o1_isVarEq); + Opcode(o1_isVarEQ); OpcodeUnImpl(); // 0x08 OpcodeUnImpl(); - Opcode(o1_isCurPicEq); - Opcode(o1_isItemPicEq); + Opcode(o1_isCurPicEQ); + Opcode(o1_isItemPicEQ); SetOpcodeTable(_actOpcodes); // 0x00 @@ -114,10 +114,10 @@ int AdlEngine_v2::o2_isFirstTime(ScriptEnv &e) { int AdlEngine_v2::o2_isRandomGT(ScriptEnv &e) { byte rnd = _random->getRandomNumber(255); - if (e.arg(1) >= rnd) - return -1; + if (rnd > e.arg(1)) + return 1; - return 1; + return -1; } int AdlEngine_v2::o2_isItemInRoom(ScriptEnv &e) { @@ -126,10 +126,10 @@ int AdlEngine_v2::o2_isItemInRoom(ScriptEnv &e) { if (room == IDI_CUR_ROOM) room = _state.room; - if (getItem(e.arg(1)).room != room) - return -1; + if (getItem(e.arg(1)).room == room) + return 2; - return 2; + return -1; } int AdlEngine_v2::o2_isNounNotInRoom(ScriptEnv &e) { |