aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen
diff options
context:
space:
mode:
authorPaul Gilbert2017-12-16 11:58:28 -0500
committerPaul Gilbert2017-12-16 11:58:28 -0500
commitd0d27928f1c5d38d380e0eb1dd5dc4ecbbdadb75 (patch)
treeef734385d324d2451358e936210064faa562f9a0 /engines/xeen
parentd2dbf59c765c2496fcbc7206aaff8cee0030af6c (diff)
downloadscummvm-rg350-d0d27928f1c5d38d380e0eb1dd5dc4ecbbdadb75.tar.gz
scummvm-rg350-d0d27928f1c5d38d380e0eb1dd5dc4ecbbdadb75.tar.bz2
scummvm-rg350-d0d27928f1c5d38d380e0eb1dd5dc4ecbbdadb75.zip
XEEN: Show Party dialog when signing into taverns
Diffstat (limited to 'engines/xeen')
-rw-r--r--engines/xeen/locations.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 76c18399e9..d48dcb6c00 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -23,6 +23,7 @@
#include "xeen/locations.h"
#include "xeen/dialogs_input.h"
#include "xeen/dialogs_items.h"
+#include "xeen/dialogs_party.h"
#include "xeen/dialogs_query.h"
#include "xeen/dialogs_spells.h"
#include "xeen/resources.h"
@@ -682,6 +683,9 @@ Character *TavernLocation::doOptions(Character *c) {
case Common::KEYCODE_s: {
// Sign In
+ PartyDialog::show(g_vm);
+
+ // Set location and position afterwards
idx = _isDarkCc ? (party._mazeId - 29) >> 1 : party._mazeId - 28;
assert(idx >= 0);
party._mazePosition.x = Res.TAVERN_EXIT_LIST[_isDarkCc ? 1 : 0][_LocationActionId][idx][0];
@@ -702,7 +706,6 @@ Character *TavernLocation::doOptions(Character *c) {
party.addTime(1440);
party._mazeId = 0;
- _vm->_quitMode = 2;
break;
}