Mercurial Mercurial > hedgewars-draft / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uGears.pas
changeset 3109 06c089cb739c
parent 3107 1fa539758c10
child 3110 c8d7c852e26a 
--- a/hedgewars/uGears.pas	Sat Mar 27 14:49:04 2010 +0000
+++ b/hedgewars/uGears.pas	Sat Mar 27 14:55:59 2010 +0000
@@ -585,22 +585,20 @@
 	begin
 		if Gear^.Kind = gtHedgehog then
 			begin
-        if PHedgehog(Gear^.Hedgehog)^.Poisoned then
-          inc(Gear^.Damage, min(5, max(0,Gear^.Health - 1 - Gear^.Damage)));
-				inc(Gear^.Damage, min(cHealthDecrease, max(0,Gear^.Health - 1 - Gear^.Damage)));
-				if PHedgehog(Gear^.Hedgehog)^.King then
-				begin
-					flag:= false;
-					team:= PHedgehog(Gear^.Hedgehog)^.Team;
-					for i:= 0 to Pred(team^.HedgehogsNumber) do
-						if (team^.Hedgehogs[i].Gear <> nil) and 
-							(not team^.Hedgehogs[i].King) and 
-							(team^.Hedgehogs[i].Gear^.Health > team^.Hedgehogs[i].Gear^.Damage) 
-						then begin
-								flag:= true;
-						end;
-					if not flag then inc(Gear^.Damage, min(5, max(0,Gear^.Health - 1 - Gear^.Damage)))
-				end;
+            if PHedgehog(Gear^.Hedgehog)^.Poisoned then
+                inc(Gear^.Damage, min(5, max(0,Gear^.Health - 1 - Gear^.Damage)));
+            inc(Gear^.Damage, min(cHealthDecrease, max(0,Gear^.Health - 1 - Gear^.Damage)));
+            if PHedgehog(Gear^.Hedgehog)^.King then
+                begin
+                flag:= false;
+                team:= PHedgehog(Gear^.Hedgehog)^.Team;
+                for i:= 0 to Pred(team^.HedgehogsNumber) do
+                    if (team^.Hedgehogs[i].Gear <> nil) and 
+                        (not team^.Hedgehogs[i].King) and 
+                        (team^.Hedgehogs[i].Gear^.Health > team^.Hedgehogs[i].Gear^.Damage) 
+                    then flag:= true;
+                if not flag then inc(Gear^.Damage, min(5, max(0,Gear^.Health - 1 - Gear^.Damage)))
+                end;
 			end;
 
 		Gear:= Gear^.NextGear
@@ -705,7 +703,7 @@
 
             if bBetweenTurns
                 or isInMultiShoot
-                or (TotalRounds = 0) then inc(step)
+                or (TotalRounds = -1) then inc(step)
             else begin
                 bBetweenTurns:= true;
                 HealthMachine;
hedgewars-draft