XEEN: Fix display of Lloyd's Beacon spell

2 files changed, 12 insertions, 13 deletions

diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index 3da5a5149e..2996cb7e94 100644
--- a/engines/xeen/dialogs/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -816,18 +816,17 @@ bool LloydsBeacon::execute() {
 	}
 
 	// Open up the text file for the destination map and read in it's name
-	File textFile(Common::String::format("%s%c%03d.txt",
-		c._lloydSide == 0 ? "xeen" : "dark",
-		c._lloydMap >= 100 ? 'x' : '0',
-		c._lloydMap));
+	Common::String txtName = Common::String::format("%s%c%03d.txt",
+		c._lloydSide ? "dark" : "xeen", c._lloydMap >= 100 ? 'x' : '0', c._lloydMap);
+	File textFile(txtName, 1);
 	Common::String mapName = textFile.readString();
 	textFile.close();
 
 	// Display the dialog
 	w.open();
-	w.writeString(Common::String::format(Res.LLOYDS_BEACON,
-		mapName.c_str(), c._lloydPosition.x, c._lloydPosition.y));
-	drawButtons(&windows[0]);
+	w.writeString(Common::String::format(Res.LLOYDS_BEACON, mapName.c_str(),
+		c._lloydPosition.x, c._lloydPosition.y));
+	drawButtons(&w);
 	w.update();
 
 	bool result = true;
diff --git a/engines/xeen/window.cpp b/engines/xeen/window.cpp
index 47732dc841..2ba7064389 100644
--- a/engines/xeen/window.cpp
+++ b/engines/xeen/window.cpp
@@ -41,7 +41,7 @@ Windows::Windows() {
 	Window windows[48] = {
 		Window(Common::Rect(0, 0, 320, 200), 0, 0, 0, 0, 320, 200),
 		Window(Common::Rect(237, 9, 317, 74), 0, 0, 237, 12, 307, 68),
-		Window(Common::Rect(225, 1, 319, 73), 1, 8, 225, 1, 319, 73),
+		Window(Common::Rect(225, 1, 320, 73), 1, 8, 225, 1, 319, 73),
 		Window(Common::Rect(0, 0, 230, 149), 0, 0, 9, 8, 216, 140),
 		Window(Common::Rect(235, 148, 309, 189), 2, 8, 0, 0, 0, 0),
 		Window(Common::Rect(70, 20, 250, 183), 3, 8, 80, 38, 240, 166),
@@ -49,13 +49,13 @@ Windows::Windows() {
 		Window(Common::Rect(108, 0, 200, 200), 5, 0, 0, 0, 0, 0),
 		Window(Common::Rect(232, 9, 312, 74), 0, 0, 0, 0, 0, 0),
 		Window(Common::Rect(103, 156, 217, 186), 6, 8, 0, 0, 0, 0),
-		Window(Common::Rect(226, 0, 319, 146), 7, 8, 0, 0, 0, 0),
+		Window(Common::Rect(226, 0, 320, 146), 7, 8, 0, 0, 0, 0),
 		Window(Common::Rect(8, 8, 224, 140), 8, 8, 8, 8, 224, 200),
 		Window(Common::Rect(0, 143, 320, 199), 9, 8, 0, 0, 0, 0),
 		Window(Common::Rect(50, 103, 266, 139), 10, 8, 0, 0, 0, 0),
 		Window(Common::Rect(0, 7, 320, 138), 11, 8, 0, 0, 0, 0),
 		Window(Common::Rect(50, 71, 182, 129), 12, 8, 0, 0, 0, 0),
-		Window(Common::Rect(228, 106, 319, 146), 13, 8, 0, 0, 0, 0),
+		Window(Common::Rect(228, 106, 320, 146), 13, 8, 0, 0, 0, 0),
 		Window(Common::Rect(20, 142, 290, 199), 14, 8, 0, 0, 0, 0),
 		Window(Common::Rect(0, 20, 320, 180), 15, 8, 0, 0, 0, 0),
 		Window(Common::Rect(231, 48, 317, 141), 16, 8, 0, 0, 0, 0),
@@ -74,10 +74,10 @@ Windows::Windows() {
 		Window(Common::Rect(12, 11, 164, 94), 0, 0, 0, 0, 52, 0),
 		Window(Common::Rect(8, 147, 224, 192), 0, 8, 0, 0, 0, 94),
 		Window(Common::Rect(232, 74, 312, 138), 29, 8, 0, 0, 0, 0),
-		Window(Common::Rect(226, 26, 319, 146), 30, 8, 0, 0, 0, 0),
-		Window(Common::Rect(225, 74, 319, 154), 31, 8, 0, 0, 0, 0),
+		Window(Common::Rect(226, 26, 320, 146), 30, 8, 0, 0, 0, 0),
+		Window(Common::Rect(225, 74, 320, 154), 31, 8, 0, 0, 0, 0),
 		Window(Common::Rect(27, 6, 195, 142), 0, 8, 0, 0, 0, 0),
-		Window(Common::Rect(225, 140, 319, 199), 0, 8, 0, 0, 0, 0),
+		Window(Common::Rect(225, 140, 320, 199), 0, 8, 0, 0, 0, 0),
 		Window(Common::Rect(12, 8, 162, 198), 0, 0, 128, 0, 119, 0),
 		Window(Common::Rect(0, 0, 320, 200), 32, 8, 0, 0, 320, 190),
 		Window(Common::Rect(0, 0, 320, 200), 33, 8, 0, 0, 320, 200)