[Scummvm-git-logs] scummvm master -> 5c70b546d3882b745ae4facc4cc107535f41a3bb

dreammaster dreammaster at scummvm.org
Sun Dec 17 19:24:30 CET 2017


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:
5c70b546d3 XEEN: Cleanup of Dwarf cutscene class & enum values


Commit: 5c70b546d3882b745ae4facc4cc107535f41a3bb
    https://github.com/scummvm/scummvm/commit/5c70b546d3882b745ae4facc4cc107535f41a3bb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-12-17T13:24:09-05:00

Commit Message:
XEEN: Cleanup of Dwarf cutscene class & enum values

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


diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index dcb9db6..6aa8fbf 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 98cc013..7331760 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() {}
 
 	/**





More information about the Scummvm-git-logs mailing list