From 78e36f75f02613db413ebc5c2b1a5031bf6398db Mon Sep 17 00:00:00 2001
From: Iurii Chernyi <terraninfo@terraninfo.net>
Date: Sat, 5 Sep 2009 15:02:58 +0000
Subject: [PATCH] Fixed issue with Linaera teleporting on top of advisor.

---
 .../scenarios/5_Linaera_the_Quick.cfg         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg
index a28c7efa181..9edc14ddabc 100644
--- a/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg
+++ b/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg
@@ -204,34 +204,34 @@ Use Elven Scouts and Linaera's power of teleportation to mount hit-and-run attac
             image=wesnoth-icon.png
         [/message]
         [item]
-            x,y=17,18
+            x,y=16,17
             image=projectiles/whitemissile-impact-2.png
         [/item]
         [delay]
             time=100
         [/delay]
         [removeitem]
-            x,y=17,18
+            x,y=16,17
         [/removeitem]
         [item]
-            x,y=17,18
+            x,y=16,17
             image=projectiles/whitemissile-impact-3.png
         [/item]
         [delay]
             time=100
         [/delay]
         [removeitem]
-            x,y=17,18
+            x,y=16,17
         [/removeitem]
         [item]
-            x,y=17,18
+            x,y=16,17
             image=projectiles/whitemissile-impact-4.png
         [/item]
         [delay]
             time=100
         [/delay]
         [removeitem]
-            x,y=17,18
+            x,y=16,17
         [/removeitem]
         [store_unit]
             variable=linaera_jump
@@ -241,15 +241,16 @@ Use Elven Scouts and Linaera's power of teleportation to mount hit-and-run attac
             kill=yes
             fire_event=no
         [/store_unit]
-        {VARIABLE linaera_jump.x 17}
-        {VARIABLE linaera_jump.y 18}
+        {VARIABLE linaera_jump.x 16}
+        {VARIABLE linaera_jump.y 17}
         [unstore_unit]
             variable=linaera_jump
+            find_vacant=yes
         [/unstore_unit]
         [redraw][/redraw]
         {GENERIC_UNIT 3 Mage 17 17} {NO_UPKEEP}
         {GENERIC_UNIT 3 Mage 16 18} {NO_UPKEEP}
-        {GENERIC_UNIT 3 Mage 16 17} {NO_UPKEEP}
+        {GENERIC_UNIT 3 Mage 15 17} {NO_UPKEEP}
         [message]
             id=Erlornas
             message=_ "So you decided to accept the invitation. Good. Welcome, I am lord Erlornas of Wesmere. I find your presence here...surprising."