[Scummvm-git-logs] scummvm master -> 63ebadaf27d55719e5975bbc20152cdbfcad6e6b

[dreammaster]

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:
63ebadaf27 XEEN: Add town entry handling for Swords


Commit: 63ebadaf27d55719e5975bbc20152cdbfcad6e6b
    https://github.com/scummvm/scummvm/commit/63ebadaf27d55719e5975bbc20152cdbfcad6e6b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-20T19:36:01-04:00

Commit Message:
XEEN: Add town entry handling for Swords

Changed paths:
    engines/xeen/locations.cpp


diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index e2359df..a58ea23 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -1965,7 +1965,30 @@ exit:
 void DwarfCutscene::getNewLocation() {
 	Party &party = *g_vm->_party;
 
-	if (_ccNum) {
+	if (g_vm->getGameID() == GType_Swords) {
+		switch (party._mazeId) {
+		case 1:
+			if (party._questItems[0]) {
+				_mazeId = 53;
+				_mazePos = Common::Point(8, 1);
+				_mazeDir = DIR_NORTH;
+				_keyFound = true;
+			}
+			break;
+
+		case 7:
+			if (party._questItems[1]) {
+				_mazeId = 92;
+				_mazePos = Common::Point(8, 1);
+				_mazeDir = DIR_NORTH;
+				_keyFound = true;
+			}
+			break;
+
+		default:
+			break;
+		}
+	} else if (_ccNum) {
 		switch (party._mazeId) {
 		case 4:
 			if (party._questItems[35]) {