[Scummvm-git-logs] scummvm master -> 8a8e16698befd7ec70a67d54f680163dceb2aaad

[dreammaster]

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:
8a8e16698b XEEN: Fix prompt text for teleport mirror


Commit: 8a8e16698befd7ec70a67d54f680163dceb2aaad
    https://github.com/scummvm/scummvm/commit/8a8e16698befd7ec70a67d54f680163dceb2aaad
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-25T18:09:03-05:00

Commit Message:
XEEN: Fix prompt text for teleport mirror

Changed paths:
    engines/xeen/scripts.cpp
    engines/xeen/scripts.h


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 2815c61..ef46f45 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -350,7 +350,7 @@ bool Scripts::doOpcode(MazeEvent &event) {
 		&Scripts::cmdMoveObj, &Scripts::cmdTakeOrGive, &Scripts::cmdDoNothing,
 		&Scripts::cmdRemove, &Scripts::cmdSetChar, &Scripts::cmdSpawn,
 		&Scripts::cmdDoTownEvent, &Scripts::cmdExit, &Scripts::cmdAlterMap,
-		&Scripts::cmdGiveExtended, &Scripts::cmdConfirmEnding, &Scripts::cmdDamage,
+		&Scripts::cmdGiveExtended, &Scripts::cmdConfirmWord, &Scripts::cmdDamage,
 		&Scripts::cmdJumpRnd, &Scripts::cmdAlterEvent, &Scripts::cmdCallEvent,
 		&Scripts::cmdReturn, &Scripts::cmdSetVar, &Scripts::cmdTakeOrGive,
 		&Scripts::cmdTakeOrGive, &Scripts::cmdCutsceneEndClouds,
@@ -362,7 +362,7 @@ bool Scripts::doOpcode(MazeEvent &event) {
 		&Scripts::cmdItemType, &Scripts::cmdMakeNothingHere, &Scripts::cmdCheckProtection,
 		&Scripts::cmdChooseNumeric, &Scripts::cmdDisplayBottomTwoLines,
 		&Scripts::cmdDisplayLarge, &Scripts::cmdExchObj, &Scripts::cmdFallToMap,
-		&Scripts::cmdDisplayMain, &Scripts::cmdGoto, &Scripts::cmdConfirmEnding,
+		&Scripts::cmdDisplayMain, &Scripts::cmdGoto, &Scripts::cmdConfirmWord,
 		&Scripts::cmdGotoRandom, &Scripts::cmdCutsceneEndDarkside,
 		&Scripts::cmdCutsceneEndWorld, &Scripts::cmdFlipWorld, &Scripts::cmdPlayCD
 	};
@@ -914,7 +914,7 @@ bool Scripts::cmdGiveExtended(ParamsIterator &params) {
 	return true;
 }
 
-bool Scripts::cmdConfirmEnding(ParamsIterator &params) {
+bool Scripts::cmdConfirmWord(ParamsIterator &params) {
 	Map &map = *_vm->_map;
 	Party &party = *_vm->_party;
 	int inputType = params.readByte();
@@ -922,19 +922,18 @@ bool Scripts::cmdConfirmEnding(ParamsIterator &params) {
 	int param2 = params.readByte();
 	int param3 = params.readByte();
 
-	Common::String msg1 = param2 ? map._events._text[param2] :
-		_vm->_interface->_interfaceText;
+	Common::String msg1 = param2 ? map._events._text[param2] : _message;
 	Common::String msg2;
 
 	if (_event->_opcode == OP_ConfirmWord_2) {
-		msg2 = map._events._text[param3];
-	} else if (param3) {
 		msg2 = "";
+	} else if (param3) {
+		msg2 = map._events._text[param3];
 	} else {
 		msg2 = Res.WHATS_THE_PASSWORD;
 	}
 
-	int result = StringInput::show(_vm, inputType, msg1, msg2,_event->_opcode);
+	int result = StringInput::show(_vm, inputType, msg1, msg2, _event->_opcode);
 	if (result) {
 		if (result == 33 && _vm->_files->_isDarkCc) {
 			doEndGame2();
diff --git a/engines/xeen/scripts.h b/engines/xeen/scripts.h
index 97029c7..51db67b 100644
--- a/engines/xeen/scripts.h
+++ b/engines/xeen/scripts.h
@@ -293,9 +293,10 @@ private:
 	bool cmdGiveExtended(ParamsIterator &params);
 	
 	/**
-	 * Confirms with the player for initiating the endgame
+	 * Prompts the user to enter a word for passwords or mirror
+	 * teleport destinations
 	 */
-	bool cmdConfirmEnding(ParamsIterator &params);
+	bool cmdConfirmWord(ParamsIterator &params);
 	
 	/**
 	 * Deals damage to a character