[Scummvm-git-logs] scummvm branch-2-2 -> d64c9507c9fa51b34567cb206c57ac186948d86f

[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:
d64c9507c9 XEEN: Fix mirror destination for Dragon Tower


Commit: d64c9507c9fa51b34567cb206c57ac186948d86f
    https://github.com/scummvm/scummvm/commit/d64c9507c9fa51b34567cb206c57ac186948d86f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-12T16:38:47-07:00

Commit Message:
XEEN: Fix mirror destination for Dragon Tower

Changed paths:
    NEWS.md
    engines/xeen/scripts.cpp


diff --git a/NEWS.md b/NEWS.md
index 9c7f4db520..3b74e0761f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -118,6 +118,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fix curing the well in Nightshadow.
    - Fix loading of wall items from savegames.
    - Fix U/D keys not working on Quests dialog
+   - Fix incorrect mirror destination for Dragon Tower
 
  ZVision:
    - Fixed regression in the safe puzzle in Zork Nemesis: The Forbidden Lands.
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 4b172bdd86..3794c1ce40 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -493,13 +493,21 @@ bool Scripts::cmdTeleport(ParamsIterator &params) {
 		// Mirror teleportation
 		assert(_mirrorId > 0);
 		MirrorEntry &me = _mirror[_mirrorId - 1];
-		mapId = me._mapId;
-		pt = me._position;
-		if (me._direction != -1)
-			party._mazeDirection = (Direction)me._direction;
 
-		if (pt.x == 0 && pt.y == 0)
-			pt.x = 999;
+		// WORKAROUND: Wrong destination for Dragon Tower in Clouds
+		if (me._name == "dragon tower") {
+			mapId = 13;
+			pt = Common::Point(10, 5);
+			party._mazeDirection = DIR_SOUTH;
+		} else {
+			mapId = me._mapId;
+			pt = me._position;
+			if (me._direction != -1)
+				party._mazeDirection = (Direction)me._direction;
+
+			if (pt.x == 0 && pt.y == 0)
+				pt.x = 999;
+		}
 
 		sound.playFX(51);
 	}