# HG changeset patch # User Wuzzy # Date 1548137522 -3600 # Node ID b390479f24c1a65175069667403287cd16f17c3d # Parent db05d9bf7466bb4577bacfd349ca2bcfab766c34 vgtHealthTag now supports setting FrameTicks <> 0 to disable automatic water handling diff -r db05d9bf7466 -r b390479f24c1 hedgewars/uVisualGearsHandlers.pas --- a/hedgewars/uVisualGearsHandlers.pas Mon Jan 21 23:50:56 2019 +0100 +++ b/hedgewars/uVisualGearsHandlers.pas Tue Jan 22 07:12:02 2019 +0100 @@ -706,8 +706,10 @@ if round(Gear^.Y) - 10 < cWaterLine then DeleteVisualGear(Gear) else - Gear^.Y:= Gear^.Y - 0.08 * Steps; - + begin + Gear^.X:= Gear^.X + Gear^.dX * Steps; + Gear^.Y:= Gear^.Y + Gear^.dY * Steps; + end; end; procedure doStepHealthTag(Gear: PVisualGear; Steps: Longword); @@ -722,7 +724,7 @@ Gear^.doStep:= @doStepHealthTagWork; -if (round(Gear^.Y) > cWaterLine) and (Gear^.Frame = 0) then +if (round(Gear^.Y) > cWaterLine) and (Gear^.Frame = 0) and (Gear^.FrameTicks = 0) then Gear^.doStep:= @doStepHealthTagWorkUnderWater; Gear^.Y:= Gear^.Y - Gear^.Tex^.h; diff -r db05d9bf7466 -r b390479f24c1 hedgewars/uVisualGearsList.pas --- a/hedgewars/uVisualGearsList.pas Mon Jan 21 23:50:56 2019 +0100 +++ b/hedgewars/uVisualGearsList.pas Tue Jan 22 07:12:02 2019 +0100 @@ -274,6 +274,7 @@ vgtHealthTag: begin Frame:= 0; + FrameTicks:= 0; Timer:= 1500; dY:= -0.08; dX:= 0;