libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Fix loading Swords blacksmiths

Browse Source
This commit is contained in:
Paul Gilbert 2018-04-16 11:20:51 -04:00
parent 5cba33c052
commit cdfe8c89f7
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/xeen/locations.cpp
View File

@ -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;

2
engines/xeen/locations.h
View File

@ -364,7 +364,7 @@ public:
/**
* 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

2
engines/xeen/scripts.cpp
View File

@ -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;