Renamed opcodes 0x49 and 0x68:

- Opcode 0x49: setDefaultMenuColor2 -> setDefaultMenuBgColor
- Opcode 0x68: setDefaultMenuColor  -> setPlayerCommandPosY

svn-id: r33240

3 files changed, 14 insertions, 12 deletions

diff --git a/engines/cine/script.h b/engines/cine/script.h
index fe39272c4c..c14b7c70d1 100644
--- a/engines/cine/script.h
+++ b/engines/cine/script.h
@@ -198,7 +198,7 @@ protected:
 	int o1_blitAndFade();
 	int o1_fadeToBlack();
 	int o1_transformPaletteRange();
-	int o1_setDefaultMenuColor2();
+	int o1_setDefaultMenuBgColor();
 	int o1_palRotate();
 	int o1_break();
 	int o1_endScript();
@@ -213,7 +213,7 @@ protected:
 	int o1_initializeZoneData();
 	int o1_setZoneDataEntry();
 	int o1_getZoneDataEntry();
-	int o1_setDefaultMenuColor();
+	int o1_setPlayerCommandPosY();
 	int o1_allowPlayerInput();
 	int o1_disallowPlayerInput();
 	int o1_changeDataDisk();
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 57b1e8f7b4..08d84d480f 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -135,7 +135,7 @@ const Opcode FWScript::_opcodeTable[] = {
 	{ &FWScript::o1_transformPaletteRange, "bbwww" },
 	/* 48 */
 	{ 0, 0 },
-	{ &FWScript::o1_setDefaultMenuColor2, "b" },
+	{ &FWScript::o1_setDefaultMenuBgColor, "b" },
 	{ &FWScript::o1_palRotate, "bbb" },
 	{ 0, 0 },
 	/* 4C */
@@ -174,7 +174,7 @@ const Opcode FWScript::_opcodeTable[] = {
 	{ &FWScript::o1_setZoneDataEntry, "bw" },
 	{ &FWScript::o1_getZoneDataEntry, "bb" },
 	/* 68 */
-	{ &FWScript::o1_setDefaultMenuColor, "b" },
+	{ &FWScript::o1_setPlayerCommandPosY, "b" },
 	{ &FWScript::o1_allowPlayerInput, "" },
 	{ &FWScript::o1_disallowPlayerInput, "" },
 	{ &FWScript::o1_changeDataDisk, "b" },
@@ -1399,10 +1399,11 @@ int FWScript::o1_transformPaletteRange() {
 	return 0;
 }
 
-int FWScript::o1_setDefaultMenuColor2() {
+/** Set the default background color used for message boxes. */
+int FWScript::o1_setDefaultMenuBgColor() {
 	byte param = getNextByte();
 
-	debugC(5, kCineDebugScript, "Line: %d: setDefaultMenuColor2(%d)", _line, param);
+	debugC(5, kCineDebugScript, "Line: %d: setDefaultMenuBgColor(%d)", _line, param);
 
 	renderer->_messageBg = param;
 	return 0;
@@ -1568,10 +1569,11 @@ int FWScript::o1_getZoneDataEntry() {
 	return 0;
 }
 
-int FWScript::o1_setDefaultMenuColor() {
+/** Set the player command string's vertical position on-screen. */
+int FWScript::o1_setPlayerCommandPosY() {
 	byte param = getNextByte();
 
-	debugC(5, kCineDebugScript, "Line: %d: setDefaultMenuColor(%d)", _line, param);
+	debugC(5, kCineDebugScript, "Line: %d: setPlayerCommandPosY(%d)", _line, param);
 
 	renderer->_cmdY = param;
 	return 0;
@@ -2380,7 +2382,7 @@ void decompileScript(const byte *scriptPtr, uint16 scriptSize, uint16 scriptIdx)
 				param = *(localScriptPtr + position);
 				position++;
 
-				sprintf(lineBuffer, "setDefaultMenuColor2(%d)\n", param);
+				sprintf(lineBuffer, "setDefaultMenuBgColor(%d)\n", param);
 
 				break;
 			}
@@ -2530,7 +2532,7 @@ void decompileScript(const byte *scriptPtr, uint16 scriptSize, uint16 scriptIdx)
 				param = *(localScriptPtr + position);
 				position++;
 
-				sprintf(lineBuffer, "setDefaultMenuBoxColor(%d)\n", param);
+				sprintf(lineBuffer, "setPlayerCommandPosY(%d)\n", param);
 
 				break;
 			}
diff --git a/engines/cine/script_os.cpp b/engines/cine/script_os.cpp
index 78b6c55564..a764281758 100644
--- a/engines/cine/script_os.cpp
+++ b/engines/cine/script_os.cpp
@@ -131,7 +131,7 @@ const Opcode OSScript::_opcodeTable[] = {
 	{ &FWScript::o1_transformPaletteRange, "bbwww" },
 	/* 48 */
 	{ 0, 0 },
-	{ &FWScript::o1_setDefaultMenuColor2, "b" },
+	{ &FWScript::o1_setDefaultMenuBgColor, "b" },
 	{ &FWScript::o1_palRotate, "bbb" },
 	{ 0, 0 },
 	/* 4C */
@@ -170,7 +170,7 @@ const Opcode OSScript::_opcodeTable[] = {
 	{ &FWScript::o1_setZoneDataEntry, "bw" },
 	{ &FWScript::o1_getZoneDataEntry, "bb" },
 	/* 68 */
-	{ &FWScript::o1_setDefaultMenuColor, "b" },
+	{ &FWScript::o1_setPlayerCommandPosY, "b" },
 	{ &FWScript::o1_allowPlayerInput, "" },
 	{ &FWScript::o1_disallowPlayerInput, "" },
 	{ &FWScript::o1_changeDataDisk, "b" }, /* Same as opcodes 0x95 and 0xA9. */