diff options
author | Martin Kiewitz | 2016-02-14 02:01:28 +0100 |
---|---|---|
committer | Martin Kiewitz | 2016-02-14 02:01:28 +0100 |
commit | 9a9ddc777e2fe1fe17db737915d0e1abd166cf86 (patch) | |
tree | d13ad02c141f6b860212575f7f102648ce8373ac | |
parent | ad7372b0c27f15e0f6313895c99963c9954758f8 (diff) | |
download | scummvm-rg350-9a9ddc777e2fe1fe17db737915d0e1abd166cf86.tar.gz scummvm-rg350-9a9ddc777e2fe1fe17db737915d0e1abd166cf86.tar.bz2 scummvm-rg350-9a9ddc777e2fe1fe17db737915d0e1abd166cf86.zip |
AGI: set.pri.base was actually available in AGI2.425
Was available only in 2.425 and in 2.936+.
Fixing comment accordingly. Also allowing the command for 2.425.
-rw-r--r-- | engines/agi/op_cmd.cpp | 4 | ||||
-rw-r--r-- | engines/agi/opcodes.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp index 8b24d250b1..e7363c313a 100644 --- a/engines/agi/op_cmd.cpp +++ b/engines/agi/op_cmd.cpp @@ -2180,8 +2180,8 @@ void cmdPushScript(AgiGame *state, AgiEngine *vm, uint8 *parameter) { } void cmdSetPriBase(AgiGame *state, AgiEngine *vm, uint8 *parameter) { - if (getVersion() < 0x2936) { - // was not available before 2.936 (last AGI2 version) + if ((getVersion() != 0x2425) && (getVersion() < 0x2936)) { + // was only available in the 2.425 interpreter and from 2.936 (last AGI2 version) onwards warning("set.pri.base called, although not available for current AGI version"); return; } diff --git a/engines/agi/opcodes.cpp b/engines/agi/opcodes.cpp index 78beb475ee..472917de77 100644 --- a/engines/agi/opcodes.cpp +++ b/engines/agi/opcodes.cpp @@ -343,18 +343,18 @@ AgiInstruction insV2[] = { { "div.n", "vn", &cmdDivN }, // B7 { "div.v", "vv", &cmdDivV }, // B8 { "close.window", "", &cmdCloseWindow }, // B9 - { "set.simple", "n", &cmdSetSimple }, // BA + { "set.simple", "n", &cmdSetSimple }, // BA AGI2.425+, *BUT* not included in AGI2.440 { "push.script", "", &cmdPushScript }, // BB { "pop.script", "", &cmdPopScript }, // BC { "hold.key", "", &cmdHoldKey }, // BD - { "set.pri.base", "n", &cmdSetPriBase }, // BE // AGI2.936+ - { "discard.sound", "n", &cmdDiscardSound }, // BF - { "hide.mouse", "", &cmdHideMouse }, // 1 arg for AGI version 3.002.086 AGI3+ only starts here + { "set.pri.base", "n", &cmdSetPriBase }, // BE AGI2.936+ *AND* also inside AGI2.425 + { "discard.sound", "n", &cmdDiscardSound }, // BF was skip for PC + { "hide.mouse", "", &cmdHideMouse }, // C0 1 arg for AGI version 3.002.086 AGI3+ only starts here { "allow.menu", "n", &cmdAllowMenu }, // C1 { "show.mouse", "", &cmdShowMouse }, // C2 { "fence.mouse", "nnnn", &cmdFenceMouse }, // C3 { "mouse.posn", "vv", &cmdMousePosn }, // C4 - { "release.key", "", &cmdReleaseKey }, // 2 args for at least the Amiga GR (v2.05 1989-03-09) using AGI 2.316 + { "release.key", "", &cmdReleaseKey }, // C5 2 args for at least the Amiga GR (v2.05 1989-03-09) using AGI 2.316 { "adj.ego.move.to.xy", "", &cmdAdjEgoMoveToXY } // C6 }; |