diff options
| author | Paul Gilbert | 2018-03-27 21:45:17 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-03-27 21:45:17 -0400 |
| commit | 5b5abd47434c3d0680f7ca7df7eb6f7291dc4599 (patch) | |
| tree | 89a582038782258b4a75c9f20e684b2f29e52f83 /engines/xeen/dialogs | |
| parent | 0fe261048f0710061cfca019d10b27751d804506 (diff) | |
| download | scummvm-rg350-5b5abd47434c3d0680f7ca7df7eb6f7291dc4599.tar.gz scummvm-rg350-5b5abd47434c3d0680f7ca7df7eb6f7291dc4599.tar.bz2 scummvm-rg350-5b5abd47434c3d0680f7ca7df7eb6f7291dc4599.zip | |
XEEN: Change Map _loadDarkSide bool to int _loadCcNum
Diffstat (limited to 'engines/xeen/dialogs')
| -rw-r--r-- | engines/xeen/dialogs/dialogs_control_panel.cpp | 4 | ||||
| -rw-r--r-- | engines/xeen/dialogs/dialogs_create_char.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, 5 insertions, 5 deletions
diff --git a/engines/xeen/dialogs/dialogs_control_panel.cpp b/engines/xeen/dialogs/dialogs_control_panel.cpp index 17c86ad5e3..5c4ed16712 100644 --- a/engines/xeen/dialogs/dialogs_control_panel.cpp +++ b/engines/xeen/dialogs/dialogs_control_panel.cpp @@ -97,11 +97,11 @@ int ControlPanel::execute() { sound.playFX(51); if (g_vm->getGameID() == GType_WorldOfXeen) { - map._loadDarkSide = false; + map._loadCcNum = 0; map.load(28); party._mazeDirection = DIR_EAST; } else { - map._loadDarkSide = true; + map._loadCcNum = 1; map.load(29); party._mazeDirection = DIR_SOUTH; } diff --git a/engines/xeen/dialogs/dialogs_create_char.cpp b/engines/xeen/dialogs/dialogs_create_char.cpp index 72f1b749ac..3115fbd10a 100644 --- a/engines/xeen/dialogs/dialogs_create_char.cpp +++ b/engines/xeen/dialogs/dialogs_create_char.cpp @@ -597,7 +597,7 @@ bool CreateCharacterDialog::saveCharacter(Character &c, int classId, Race race, c.clear(); c._name = name; c._savedMazeId = party._priorMazeId; - c._xeenSide = map._loadDarkSide; + c._xeenSide = map._loadCcNum; c._sex = sex; c._race = race; c._class = (CharacterClass)classId; diff --git a/engines/xeen/dialogs/dialogs_party.cpp b/engines/xeen/dialogs/dialogs_party.cpp index c3d6843ffd..306d1f9c2b 100644 --- a/engines/xeen/dialogs/dialogs_party.cpp +++ b/engines/xeen/dialogs/dialogs_party.cpp @@ -65,7 +65,7 @@ void PartyDialog::execute() { _charList.clear(); for (int i = 0; i < XEEN_TOTAL_CHARACTERS; ++i) { Character &player = party._roster[i]; - if (player._name.empty() || player._xeenSide != (map._loadDarkSide ? 1 : 0)) + if (player._name.empty() || player._xeenSide != map._loadCcNum) continue; _charList.push_back(i); diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp index 11c49989ac..296bf29071 100644 --- a/engines/xeen/dialogs/dialogs_spells.cpp +++ b/engines/xeen/dialogs/dialogs_spells.cpp @@ -777,7 +777,7 @@ bool LloydsBeacon::execute() { result = false; } else { sound.playFX(51); - map._loadDarkSide = ccNum; + map._loadCcNum = ccNum; if (c._lloydMap != party._mazeId || c._lloydSide != ccNum) { map.load(c._lloydMap); } |