[Scummvm-git-logs] scummvm master -> d0d27928f1c5d38d380e0eb1dd5dc4ecbbdadb75
dreammaster
dreammaster at scummvm.org
Sat Dec 16 17:58:37 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:
d0d27928f1 XEEN: Show Party dialog when signing into taverns
Commit: d0d27928f1c5d38d380e0eb1dd5dc4ecbbdadb75
https://github.com/scummvm/scummvm/commit/d0d27928f1c5d38d380e0eb1dd5dc4ecbbdadb75
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-12-16T11:58:28-05:00
Commit Message:
XEEN: Show Party dialog when signing into taverns
Changed paths:
engines/xeen/locations.cpp
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 76c1839..d48dcb6 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;
}
More information about the Scummvm-git-logs
mailing list