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
authorsheepluva
Tue, 14 Jul 2015 02:01:58 +0200
changeset 11010 745b0fb017c1
parent 11009 5b37f240edf8 (current diff)
parent 11002 01c8e95d2265 (diff)
child 11011 6c66b594b780
merge
--- a/hedgewars/uGearsList.pas	Tue Jul 14 01:56:47 2015 +0200
+++ b/hedgewars/uGearsList.pas	Tue Jul 14 02:01:58 2015 +0200
@@ -733,10 +733,12 @@
                     k:= true;
             if not k then
                 for i:= 0 to Pred(team^.Clan^.TeamsNumber) do
-                    begin
-                    team^.Clan^.Teams[i]^.hasGone:= true;
-                    TeamGoneEffect(team^.Clan^.Teams[i]^)
-                    end
+                    with team^.Clan^.Teams[i]^ do
+                        for t:= 0 to cMaxHHIndex do
+                            if Hedgehogs[t].Gear <> nil then
+                                Hedgehogs[t].Gear^.Health:= 0
+                            else if (Hedgehogs[t].GearHidden <> nil) then
+                                Hedgehogs[t].GearHidden^.Health:= 0  // hog is still hidden. if tardis should return though, lua, eh...
             end;
 
         // should be not CurrentHedgehog, but hedgehog of the last gear which caused damage to this hog
hedgewars