From 5e57bcaab2b00a6939e9671acac7aa358a96fed0 Mon Sep 17 00:00:00 2001
From: "Ignacio R. Morelle" <shadowm@wesnoth.org>
Date: Sat, 21 Jun 2014 10:12:56 -0400
Subject: [PATCH] NR: Search for White Magi respawn locs only within map edges
 (bug #22097)

Without this, the engine may match map borders and send the respawnee
back to the player's recall list as those count as invalid locations
like "recall","recall".
---
 changelog                                           |  3 +++
 .../campaigns/Northern_Rebirth/utils/herodeaths.cfg | 13 ++++++++++++-
 players_changelog                                   |  5 +++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 834f4e6d30c..9aff45433a1 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ Version 1.11.15+dev:
    * Legend of Wesmere
      * Disabled the non finished chapters 4 and 5 in the mp port.
      * Fix scenario 3 which was broken after a map change.
+   * Northern Rebirth:
+     * Fixed Sister Thera and Father Morvin respawning into the recall list if
+       the other is on the north or west map edges.
    * Son of the Black Eye: minor balance tweaks to scenarios 15, 17 and 18
  * Editor:
    * Added an entry for the terrain description help to the context menu.
diff --git a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
index d4e2e6d5b96..39635bec83c 100644
--- a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
+++ b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
@@ -229,6 +229,11 @@
             {VARIABLE respawn_hub (Tallin)}
         [/else]
     [/if]
+
+    [store_map_dimensions]
+        variable=respawn_map
+    [/store_map_dimensions]
+
     [while]
         [variable]
             name=respawn_point.length
@@ -253,11 +258,17 @@
                         terrain=Wo,*^Xm,X*,Q*
                     [/not]
                 [/and]
+                # Exclude map edges, otherwise the unit gets sent to the recall list
+                [and]
+                    x=1-$respawn_map.width
+                    y=1-$respawn_map.height
+                [/and]
             [/store_locations]
             {VARIABLE_OP current_radius add 1}
         [/do]
     [/while]
-    {CLEAR_VARIABLE current_radius,respawn_hub}
+
+    {CLEAR_VARIABLE current_radius,respawn_hub,respawn_map}
 #enddef
 
 # Sister Thera death, seven randomly chosen dialogues
diff --git a/players_changelog b/players_changelog
index be4db521dec..cb3b86764ec 100644
--- a/players_changelog
+++ b/players_changelog
@@ -3,6 +3,11 @@ changes may be omitted). For a complete list of changes, see the main
 changelog: https://github.com/wesnoth/wesnoth/blob/1.12/changelog
 
 Version 1.11.15+dev:
+ * Campaigns:
+   * Northern Rebirth:
+     * Fixed Sister Thera and Father Morvin respawning into the recall list if
+       the other is on the north or west map edges.
+
  * Language and i18n:
    * Updated translations: German.