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.
Fix rev dec8aafc6414 (not tested)
authorunc0rr
Sun, 07 Nov 2010 20:36:16 +0300
changeset 4182 5240a84df702
parent 4181 1f37ff58062f
child 4183 646fc9e96ce2
child 4184 bc2b88eea8c4
Fix rev dec8aafc6414 (not tested)
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Sun Nov 07 20:33:34 2010 +0300
+++ b/hedgewars/GSHandlers.inc	Sun Nov 07 20:36:16 2010 +0300
@@ -1769,7 +1769,7 @@
 
     AmmoShove(Gear, 30, 115);
 
-    HHGear^.State := HHGear^.State and not gstNoDamage;
+    HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving;
     Gear^.Timer := 250;
     Gear^.doStep := @doStepIdle
 end;
@@ -1790,7 +1790,8 @@
         Gear^.X := Gear^.X + Gear^.dX * 5
     end;
 
-    HHGear^.State := HHGear^.State and not gstNoDamage;
+    HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving;
+
     Gear^.Timer := 250;
     Gear^.doStep := @doStepIdle
 end;
--- a/hedgewars/uGears.pas	Sun Nov 07 20:33:34 2010 +0300
+++ b/hedgewars/uGears.pas	Sun Nov 07 20:36:16 2010 +0300
@@ -1415,9 +1415,7 @@
     begin
     t^.ar[t^.Count]:= CurrentHedgehog^.Gear;
     inc(t^.Count)
-    end else
-    with CurrentHedgehog^.Gear^ do
-        State:= State or gstMoving;
+    end;
 
 i:= t^.Count;
hedgewars