XEEN: Fix loading Swords blacksmiths

scummvm · Apr 16, 2018 · cdfe8c89f7671a09a418617d059524b88fff2d4c · cdfe8c8
1 parent 5cba33c
commit cdfe8c89f7671a09a418617d059524b88fff2d4c
Unified Split

Showing with 7 additions and 4 deletions.

+5 −2 engines/xeen/locations.cpp

+1 −1 engines/xeen/locations.h

+1 −1 engines/xeen/scripts.cpp
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
@@ -2240,9 +2240,12 @@ int PyramidLocation::show() {
 LocationManager::LocationManager() : _location(nullptr) {
 }
 
-int LocationManager::doAction(LocationAction actionId) {
+int LocationManager::doAction(int actionId) {
+	LocationAction action = (g_vm->getGameID() == GType_Swords && actionId > 13 && actionId < 18) ?
+		BLACKSMITH : (LocationAction)actionId;
+
 	// Create the desired location
-	switch (actionId) {
+	switch (action) {
 	case BANK:
 		_location = new Locations::BankLocation();
 		break;

diff --git a/engines/xeen/locations.h b/engines/xeen/locations.h
@@ -364,7 +364,7 @@ class LocationManager {
 	/**
 	 * Show a given location, and return any result
 	 */
-	int doAction(LocationAction actionId);
+	int doAction(int actionId);
 
 	/**
 	 * Returns true if a town location (bank, blacksmith, etc.) is currently active

diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
@@ -854,7 +854,7 @@ bool Scripts::cmdSpawn(ParamsIterator &params) {
 }
 
 bool Scripts::cmdDoTownEvent(ParamsIterator &params) {
-	_scriptResult = _vm->_locations->doAction((LocationAction)params.readByte());
+	_scriptResult = _vm->_locations->doAction(params.readByte());
 	_vm->_party->_stepped = true;
 	_refreshIcons = true;