[Scummvm-cvs-logs] scummvm master -> 4e83a49b0fe42de37827ecffe5a65e492e76ea06

[sev-]

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:
4e83a49b0f AGI: Fix bug #3398171: AGI: SQ1/SQ2: problem entering name


Commit: 4e83a49b0fe42de37827ecffe5a65e492e76ea06
    https://github.com/scummvm/scummvm/commit/4e83a49b0fe42de37827ecffe5a65e492e76ea06
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-08-27T15:43:46-07:00

Commit Message:
AGI: Fix bug #3398171: AGI: SQ1/SQ2: problem entering name

Was introduced during refactoring to SCI-like opcode handling.
Also restored original comments about opcode parameter differences
between AGI versions.

Changed paths:
    engines/agi/opcodes.cpp



diff --git a/engines/agi/opcodes.cpp b/engines/agi/opcodes.cpp
index c2cecef..d1baab9 100644
--- a/engines/agi/opcodes.cpp
+++ b/engines/agi/opcodes.cpp
@@ -288,7 +288,7 @@ AgiInstruction insV2[] = {
 	{ "status.line.on",		"",			&cmdStatusLineOn },
 	{ "status.line.off",	"",			&cmdStatusLineOff },
 	{ "set.string",			"ns",		&cmdSetString },
-	{ "get.string",			"ns",		&cmdGetString },
+	{ "get.string",			"nsnnn",		&cmdGetString },
 	{ "word.to.string",		"nn",		&cmdWordToString },
 	{ "parse",				"n",		&cmdParse },
 	{ "get.num",			"nv",		&cmdGetNum },
@@ -307,7 +307,7 @@ AgiInstruction insV2[] = {
 	{ "program.control",	"",			&cmdProgramControl },
 	{ "player.control",		"",			&cmdPlayerControl },
 	{ "obj.status.v",		"v",		&cmdObjStatusF },
-	{ "quit",				"n",		&cmdQuit },
+	{ "quit",				"n",		&cmdQuit },  // 0 args for AGI version 2.089
 	{ "show.mem",			"",			&cmdShowMem },
 	{ "pause",				"",			&cmdPause },
 	{ "echo.line",			"",			&cmdEchoLine },
@@ -324,16 +324,16 @@ AgiInstruction insV2[] = {
 	{ "reposition.to.v",	"nvv",		&cmdRepositionToF },
 	{ "trace.on",			"",			&cmdTraceOn },
 	{ "trace.info", 		"nnn",		&cmdTraceInfo },
-	{ "print.at",			"snnn",		&cmdPrintAt },
+	{ "print.at",			"snnn",		&cmdPrintAt }, // 3 args for AGI versions before 2.440
 	{ "print.at.v",			"vnnn",		&cmdPrintAtV },
 	{ "discard.view.v",		"v",		&cmdDiscardView},
 	{ "clear.text.rect",	"nnnnn",	&cmdClearTextRect },
 	{ "set.upper.left",		"nn",		&cmdSetUpperLeft },
 	{ "set.menu",			"s",		&cmdSetMenu },
-	{ "set.menu.member",	"sn",		&cmdSetMenuItem },
+	{ "set.menu.item",		"sn",		&cmdSetMenuItem },
 	{ "submit.menu",		"",			&cmdSubmitMenu },
-	{ "enable.member",		"n",		&cmdEnableItem },
-	{ "disable.member",		"n",		&cmdDisableItem },
+	{ "enable.item",		"n",		&cmdEnableItem },
+	{ "disable.item",		"n",		&cmdDisableItem },
 	{ "menu.input",			"",			&cmdMenuInput },
 	{ "show.obj.v",			"v",		&cmdShowObjV },
 	{ "open.dialogue",		"",			&cmdOpenDialogue },
@@ -349,12 +349,12 @@ AgiInstruction insV2[] = {
 	{ "hold.key",			"",			&cmdHoldKey },
 	{ "set.pri.base",		"n",		&cmdSetPriBase },
 	{ "discard.sound",		"n",		&cmdDiscardSound },
-	{ "hide.mouse",			"",			&cmdHideMouse },
+	{ "hide.mouse",			"",			&cmdHideMouse }, // 1 arg for AGI version 3.002.086
 	{ "allow.menu",			"n",		&cmdAllowMenu },
 	{ "show.mouse",			"",			&cmdShowMouse },
 	{ "fence.mouse",		"nnnn",		&cmdFenceMouse },
 	{ "mouse.posn",			"vv",		&cmdMousePosn },
-	{ "release.key",		"",			&cmdReleaseKey },
+	{ "release.key",		"",			&cmdReleaseKey }, // 2 args for at least the Amiga GR (v2.05 1989-03-09) using AGI 2.316
 	{ "adj.ego.move.to.xy",	"",			&cmdAdjEgoMoveToXY }
 };