# HG changeset patch # User nemo # Date 1316198584 14400 # Node ID c89d5065d9563a2d45ffcaf8b8f4834e3d12f543 # Parent 97c240202986b2a6940a7b0695562ae1fddbcfae Requested a few times diff -r 97c240202986 -r c89d5065d956 hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Fri Sep 16 14:04:21 2011 -0400 +++ b/hedgewars/GSHandlers.inc Fri Sep 16 14:43:04 2011 -0400 @@ -5102,7 +5102,7 @@ begin if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible = 0) then begin - AfterAttack; + AfterAttack; if Gear = CurAmmoGear then CurAmmoGear := nil; HideHog(HH) end @@ -5119,7 +5119,20 @@ end end; -if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then inc(Gear^.Power); +if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then + begin + inc(Gear^.Power); + if (Gear^.Power = 172) and (Gear^.Hedgehog^.Gear <> nil) then + begin + with Gear^.Hedgehog^.Gear^ do + begin + State:= State or gstAnimation; + Tag:= 2; + Timer:= 0; + Pos:= 0 + end + end + end; if (Gear^.Pos = 3) and (GameTicks and $1F = 0) and (Gear^.Power > 0) then dec(Gear^.Power); if (Gear^.Pos = 1) and (Gear^.Power = 255) and ((GameTicks mod 2000) = 1000) then Gear^.Pos:= 2; if (Gear^.Pos = 3) and (Gear^.Power = 0) then diff -r 97c240202986 -r c89d5065d956 hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Fri Sep 16 14:04:21 2011 -0400 +++ b/hedgewars/uGearsRender.pas Fri Sep 16 14:43:04 2011 -0400 @@ -328,7 +328,7 @@ hx:= ox + 8 * sign; hy:= oy - 2; aangle:= Gear^.Angle * 180 / cMaxAngle - 90; - if CurAmmoGear <> nil then + if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind <> gtTardis) then begin case CurAmmoGear^.Kind of gtShotgunShot: begin