diff options
| author | Paul Gilbert | 2018-04-15 09:51:18 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-04-15 09:51:18 -0400 |
| commit | caba18856914daac4339f040b39b7b73795c6310 (patch) | |
| tree | daa3eba759f936a6491fb9f5f9e79fc1cd0d7e91 /engines/xeen/dialogs | |
| parent | a7bc08992e2acd361c485179d2142bc9121cda65 (diff) | |
| download | scummvm-rg350-caba18856914daac4339f040b39b7b73795c6310.tar.gz scummvm-rg350-caba18856914daac4339f040b39b7b73795c6310.tar.bz2 scummvm-rg350-caba18856914daac4339f040b39b7b73795c6310.zip | |
XEEN: Mode renamings, fix loading savegame during script dragging party
Diffstat (limited to 'engines/xeen/dialogs')
| -rw-r--r-- | engines/xeen/dialogs/dialogs_input.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/dialogs/dialogs_message.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/dialogs/dialogs_party.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/dialogs/dialogs_spells.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/xeen/dialogs/dialogs_input.cpp b/engines/xeen/dialogs/dialogs_input.cpp index 764d772edc..d273e57b10 100644 --- a/engines/xeen/dialogs/dialogs_input.cpp +++ b/engines/xeen/dialogs/dialogs_input.cpp @@ -84,7 +84,7 @@ Common::KeyState Input::waitForKey(const Common::String &msg) { intf._tillMove = 0; bool flag = !_vm->_startupWindowActive && !windows[25]._enabled - && _vm->_mode != MODE_FF && _vm->_mode != MODE_17; + && _vm->_mode != MODE_FF && _vm->_mode != MODE_INTERACTIVE7; PendingEvent pe; while (!_vm->shouldExit()) { diff --git a/engines/xeen/dialogs/dialogs_message.cpp b/engines/xeen/dialogs/dialogs_message.cpp index df8afea34c..f571e6e811 100644 --- a/engines/xeen/dialogs/dialogs_message.cpp +++ b/engines/xeen/dialogs/dialogs_message.cpp @@ -51,7 +51,7 @@ void MessageDialog::execute(const Common::String &msg, MessageWaitType waitType) break; case WT_ANIMATED_WAIT: - if (windows[11]._enabled || _vm->_mode == MODE_17) { + if (windows[11]._enabled || _vm->_mode == MODE_INTERACTIVE7) { g_vm->_locations->wait(); break; } diff --git a/engines/xeen/dialogs/dialogs_party.cpp b/engines/xeen/dialogs/dialogs_party.cpp index 306d1f9c2b..6bd54db712 100644 --- a/engines/xeen/dialogs/dialogs_party.cpp +++ b/engines/xeen/dialogs/dialogs_party.cpp @@ -58,7 +58,7 @@ void PartyDialog::execute() { setupBackground(); while (!_vm->shouldExit()) { - _vm->_mode = MODE_1; + _vm->_mode = MODE_INTERACTIVE; // Build up a list of available characters in the Roster that are on the // same side of Xeen as the player is currently on diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp index e59fbdef9c..122b22985e 100644 --- a/engines/xeen/dialogs/dialogs_spells.cpp +++ b/engines/xeen/dialogs/dialogs_spells.cpp @@ -137,7 +137,7 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int spells._lastCaster = _buttonValue; intf.highlightChar(_buttonValue); - if (_vm->_mode == MODE_17) { + if (_vm->_mode == MODE_INTERACTIVE7) { windows[10].writeString(Common::String::format(Res.GUILD_OPTIONS, XeenEngine::printMil(party._gold).c_str(), Res.GUILD_TEXT, c->_name.c_str())); } else { |