# HG changeset patch
# User Wuzzy <almikes@aol.com>
# Date 1506808401 -7200
# Node ID c8edce7e5f184d3cd339a7cc78b6ea8884833e5e
# Parent  07fdda8c13a27232cf92837bd555fa76235feeb9# Parent  d972b31f88816052f1ac2d1273ba22d605fb32f7
Merge sheepluva's changes

diff -r d972b31f8881 -r c8edce7e5f18 ChangeLog.txt
--- a/ChangeLog.txt	Sat Sep 30 21:54:47 2017 +0200
+++ b/ChangeLog.txt	Sat Sep 30 23:53:21 2017 +0200
@@ -239,6 +239,7 @@
  + Rewrote some help texts in basic rope training
  + Graphical effect (black bars) while in cut scenes
  + Change description and icon for baseball bat in Knockball mission map
+ * TrophyRace: Fix hedgehogs not being eliminated anymore after one hog skipped or ran out of time
  * Portal Mind Challenge was cleaned up and reworked (especially less awful wording)
  * Fixed Target Practice missions getting stuck when a target dropped into water
  * Fixed mistakes and bad wording of strings in several missions, scripts and campaigns
diff -r d972b31f8881 -r c8edce7e5f18 share/hedgewars/Data/Maps/TrophyRace/map.lua
--- a/share/hedgewars/Data/Maps/TrophyRace/map.lua	Sat Sep 30 21:54:47 2017 +0200
+++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua	Sat Sep 30 23:53:21 2017 +0200
@@ -168,9 +168,9 @@
                     --Place a grenade to make inactive slowest hog active
                     x, y = GetGearPosition(worsthog)
                     AddGear(x, y, gtShell, 0, 0, 0, 0)
-                    worsttime = 0
-                    worsthog = nil
                 end
+                worsttime = 0
+                worsthog = nil
             end
             
             for i=0, ClansCount -1 do