Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge sheepluva's changes
authorWuzzy <almikes@aol.com>
Sat, 30 Sep 2017 23:53:21 +0200
changeset 12623 c8edce7e5f18
parent 12622 07fdda8c13a2 (diff)
parent 12621 d972b31f8881 (current diff)
child 12624 705dde538519
Merge sheepluva's changes
--- 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
--- 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
hedgewars