diff options
| author | Paul Gilbert | 2017-12-17 13:24:09 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-12-17 13:24:09 -0500 |
| commit | 5c70b546d3882b745ae4facc4cc107535f41a3bb (patch) | |
| tree | 7ff19e75934701a3ba443b9826c239cbffad8007 /engines | |
| parent | f8bc19159be06e0bdfa4cfda9be0eadd29208906 (diff) | |
| download | scummvm-rg350-5c70b546d3882b745ae4facc4cc107535f41a3bb.tar.gz scummvm-rg350-5c70b546d3882b745ae4facc4cc107535f41a3bb.tar.bz2 scummvm-rg350-5c70b546d3882b745ae4facc4cc107535f41a3bb.zip | |
XEEN: Cleanup of Dwarf cutscene class & enum values
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/locations.cpp | 12 | ||||
| -rw-r--r-- | engines/xeen/locations.h | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp index dcb9db6758..6aa8fbf4fc 100644 --- a/engines/xeen/locations.cpp +++ b/engines/xeen/locations.cpp @@ -1809,9 +1809,7 @@ const int16 DWARF2_Y[2][16] = { { 0, 12, 25, 37, 50, 62, 75, 87, 100, 112, 125, 137, 150, 162, 175, 186 } }; -DwarfCutscene::DwarfCutscene(bool isDwarf) : CutsceneLocation(NO_ACTION) { - _townMaxId = Res.TOWN_MAXES[_isDarkCc][isDwarf ? DWARF1 : DWARF2]; -} +DwarfCutscene::DwarfCutscene() : CutsceneLocation(DWARF_MINE) {} int DwarfCutscene::show() { EventsManager &events = *g_vm->_events; @@ -2226,11 +2224,9 @@ int LocationManager::doAction(LocationAction actionId) { case GOLEM: _location = new Locations::GolemCutscene(); break; - case DWARF1: - _location = new Locations::DwarfCutscene(true); - break; - case DWARF2: - _location = new Locations::DwarfCutscene(false); + case DWARF_MINE: + case DWARF_TOWN: + _location = new Locations::DwarfCutscene(); break; case SPHINX: _location = new Locations::SphinxCutscene(); diff --git a/engines/xeen/locations.h b/engines/xeen/locations.h index 98cc013873..7331760d5b 100644 --- a/engines/xeen/locations.h +++ b/engines/xeen/locations.h @@ -34,7 +34,7 @@ namespace Xeen { enum LocationAction { BANK = 0, BLACKSMITH = 1, GUILD = 2, TAVERN = 3, TEMPLE = 4, TRAINING = 5, ARENA = 6, NO_ACTION = 7, REAPER = 8, GOLEM = 9, - DWARF1 = 10, SPHINX = 11, PYRAMID = 12, DWARF2 = 13 + DWARF_MINE = 10, SPHINX = 11, PYRAMID = 12, DWARF_TOWN = 13 }; class XeenEngine; @@ -308,7 +308,7 @@ private: */ void getNewLocation(); public: - DwarfCutscene(bool isDwarf1); + DwarfCutscene(); virtual ~DwarfCutscene() {} /** |