# HG changeset patch # User nemo # Date 1417291027 18000 # Node ID 2effda40c3b22d3026b59d06cd9ec36f4c990edd # Parent 814acf1511be85b7a8e58fbd5032b827b9d99801 Move cake FollowGear to Attack like most others, remove the gmAttack clearing which is also done in Attack. diff -r 814acf1511be -r 2effda40c3b2 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Sat Nov 29 14:00:40 2014 -0500 +++ b/hedgewars/uGearsHandlersMess.pas Sat Nov 29 14:57:07 2014 -0500 @@ -3089,11 +3089,8 @@ AllInactive := false; HHGear := Gear^.Hedgehog^.Gear; - HHGear^.Message := HHGear^.Message and (not gmAttack); Gear^.CollisionMask:= lfNotCurrentMask; - FollowGear := Gear; - Gear^.dY:= cMaxWindSpeed * 100; Gear^.doStep := @doStepCakeFall diff -r 814acf1511be -r 2effda40c3b2 hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Sat Nov 29 14:00:40 2014 -0500 +++ b/hedgewars/uGearsHedgehog.pas Sat Nov 29 14:57:07 2014 -0500 @@ -443,6 +443,7 @@ amTardis, amPiano, amIceGun, amRubber: CurAmmoGear:= newGear; end; + if CurAmmoType = amCake then FollowGear:= newGear; if ((CurAmmoType = amMine) or (CurAmmoType = amSMine)) and (GameFlags and gfInfAttack <> 0) then newGear^.FlightTime:= GameTicks + 1000