Skip to content

Commit

Permalink
AGI: set.pri.base was actually available in AGI2.425
Browse files Browse the repository at this point in the history
Was available only in 2.425 and in 2.936+.
Fixing comment accordingly. Also allowing the command for 2.425.
  • Loading branch information
Martin Kiewitz committed Feb 14, 2016
1 parent 75d26f3 commit a1decff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions engines/agi/op_cmd.cpp
Expand Up @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions engines/agi/opcodes.cpp
Expand Up @@ -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
};

Expand Down

0 comments on commit a1decff

Please sign in to comment.