Fix bug mentioned in http://www.wesnoth.org/forum/viewtopic.php?f=8&t=21803

...and remove a hack while doing it.

data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg

@@ -252,14 +252,18 @@
                 id=Bugg
             [/have_unit]
             [then]
-                #override kills being processed after
-                #units being created if they're in the same event
-                [command]
-                    [kill]
-                        id=Bugg
-                    [/kill]
 
-                    {LOYAL_UNIT 2 (Sea Orc) 16 18 (Bugg) ( _ "Bugg")}
+				[store_unit]
+					variable=bugg_flip
+					[filter]
+						id=Bugg
+					[/filter]
+					kill=yes
+				[/store_unit]
+
+                {LOYAL_UNIT 2 (Sea Orc) $bugg_flip.x $bugg_flip.y (Bugg) ( _ "Bugg")}
+
+				{CLEAR_VARIABLE bugg_flip}
 				
                 [message]
                     speaker=Bugg
@@ -271,7 +275,7 @@
                     image=portraits/James_Woo/orc-warlord2.png
                     message= _ "(Sigh) Will someone kill this idiot for me, please?"
                 [/message]
-                [/command]
+
             [/then]
         [/if]
     [/event]