ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

XEEN: Fix switching characters within town actions

Browse Source
This commit is contained in:
Paul Gilbert
2017-11-23 18:56:18 -05:00
parent 121718c50d
commit 63b0b417bb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/xeen/town.cpp
+6 -5
View File
@@ -72,7 +72,7 @@ int Town::townAction(TownAction actionId) {
Sound &sound = *_vm->_sound;
bool isDarkCc = _vm->_files->_isDarkCc;
if (actionId == 12) {
if (actionId == ACTION12) {
pyramidEvent();
return 0;
}
@@ -220,7 +220,7 @@ int Town::townAction(TownAction actionId) {
intf._levitateUIFrame = 0;
_townSprites[_drawFrameIndex / 8].draw(screen, _drawFrameIndex % 8, _townPos);
if (actionId == 0 && isDarkCc) {
if (actionId == BANK && isDarkCc) {
_townSprites[4].draw(screen, _vm->getRandomNumber(13, 18),
Common::Point(8, 30));
}
@@ -236,7 +236,7 @@ int Town::townAction(TownAction actionId) {
intf.highlightChar(0);
drawTownAnim(1);
if (actionId == 0)
if (actionId == BANK)
intf._overallFrame = 2;
sound.playSound(vocName, 1);
@@ -244,12 +244,13 @@ int Town::townAction(TownAction actionId) {
do {
townWait();
charP = doTownOptions(charP);
title = createTownText(*charP);
screen._windows[10].writeString(title);
drawButtons(&screen);
} while (!_vm->shouldQuit() && _buttonValue != Common::KEYCODE_ESCAPE);
switch (actionId) {
case 1:
case BLACKSMITH:
// Leave blacksmith
if (isDarkCc) {
sound.stopSound();
@@ -257,7 +258,7 @@ int Town::townAction(TownAction actionId) {
}
break;
case 3: {
case TAVERN: {
// Leave Tavern
sound.stopSound();
sound.playSound(isDarkCc ? "gdluck1.voc" : "goodbye.voc", 1);
engines/xeen/town.h
+1 -1
View File
@@ -34,7 +34,7 @@ namespace Xeen {
enum TownAction {
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, DWARF2 = 13
DWARF1 = 10, SPHINX = 11, ACTION12 = 12, DWARF2 = 13
};
class XeenEngine;