[Scummvm-cvs-logs] scummvm master -> 9a9ddc777e2fe1fe17db737915d0e1abd166cf86

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9a9ddc777e AGI: set.pri.base was actually available in AGI2.425


Commit: 9a9ddc777e2fe1fe17db737915d0e1abd166cf86
    https://github.com/scummvm/scummvm/commit/9a9ddc777e2fe1fe17db737915d0e1abd166cf86
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-14T02:01:28+01:00

Commit Message:
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.

Changed paths:
    engines/agi/op_cmd.cpp
    engines/agi/opcodes.cpp



diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 8b24d25..e7363c3 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 78beb47..472917d 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
 };