diff options
| author | Paul Gilbert | 2017-11-25 18:09:03 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-11-25 18:09:03 -0500 |
| commit | 8a8e16698befd7ec70a67d54f680163dceb2aaad (patch) | |
| tree | 63b5aa85f6e92de9fb5f5ec96b190c591a22d2e9 | |
| parent | a7182e2a6a0062e5f7e0a224e2aca63eb3733c66 (diff) | |
| download | scummvm-rg350-8a8e16698befd7ec70a67d54f680163dceb2aaad.tar.gz scummvm-rg350-8a8e16698befd7ec70a67d54f680163dceb2aaad.tar.bz2 scummvm-rg350-8a8e16698befd7ec70a67d54f680163dceb2aaad.zip | |
XEEN: Fix prompt text for teleport mirror
| -rw-r--r-- | engines/xeen/scripts.cpp | 15 | ||||
| -rw-r--r-- | engines/xeen/scripts.h | 5 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp index 2815c617bd..ef46f45c24 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 ¶ms) { return true; } -bool Scripts::cmdConfirmEnding(ParamsIterator ¶ms) { +bool Scripts::cmdConfirmWord(ParamsIterator ¶ms) { Map &map = *_vm->_map; Party &party = *_vm->_party; int inputType = params.readByte(); @@ -922,19 +922,18 @@ bool Scripts::cmdConfirmEnding(ParamsIterator ¶ms) { 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 97029c7973..51db67bfa8 100644 --- a/engines/xeen/scripts.h +++ b/engines/xeen/scripts.h @@ -293,9 +293,10 @@ private: bool cmdGiveExtended(ParamsIterator ¶ms); /** - * Confirms with the player for initiating the endgame + * Prompts the user to enter a word for passwords or mirror + * teleport destinations */ - bool cmdConfirmEnding(ParamsIterator ¶ms); + bool cmdConfirmWord(ParamsIterator ¶ms); /** * Deals damage to a character |