hedgewars/uGearsHedgehog.pas
changeset 9917 1ca194a8b509
parent 9914 ba26595503ab
child 9950 2759212a27de
child 9971 071902835770
equal deleted inserted replaced
9914:ba26595503ab 9917:1ca194a8b509
  1059             Gear^.Y:= Gear^.Y + _1
  1059             Gear^.Y:= Gear^.Y + _1
  1060             end;
  1060             end;
  1061         Gear^.State:= Gear^.State and not gstCollision 
  1061         Gear^.State:= Gear^.State and not gstCollision 
  1062         end;
  1062         end;
  1063 
  1063 
  1064     CheckGearDrowning(Gear);
       
  1065     // could become nil if ai's hog fails to respawn in ai survival
  1064     // could become nil if ai's hog fails to respawn in ai survival
  1066     if Gear = nil then exit;
  1065     if Gear = nil then exit;
  1067     // hide target cursor if current hog is drowning
  1066     // hide target cursor if current hog is drowning
  1068     if (Gear^.State and gstDrowning) <> 0 then
  1067     if (Gear^.State and gstDrowning) <> 0 then
  1069         if (CurrentHedgehog^.Gear = Gear) then
  1068         if (CurrentHedgehog^.Gear = Gear) then
  1338 
  1337 
  1339 ////////////////////////////////////////////////////////////////////////////////
  1338 ////////////////////////////////////////////////////////////////////////////////
  1340 procedure doStepHedgehog(Gear: PGear);
  1339 procedure doStepHedgehog(Gear: PGear);
  1341 var tX: hwFloat;
  1340 var tX: hwFloat;
  1342 begin
  1341 begin
       
  1342 CheckGearDrowning(Gear);
       
  1343 if Gear = nil then exit;
  1343 tX:= Gear^.X;
  1344 tX:= Gear^.X;
  1344 if WorldWrap(Gear) then
  1345 if WorldWrap(Gear) then
  1345     begin
  1346     begin
  1346     if (WorldEdge <> weBounce) and (Gear = CurrentHedgehog^.Gear) and 
  1347     if (WorldEdge <> weBounce) and (Gear = CurrentHedgehog^.Gear) and 
  1347        (CurAmmoGear <> nil) and (CurAmmoGear^.Kind =gtRope) and (CurAmmoGear^.Elasticity <> _0) then
  1348        (CurAmmoGear <> nil) and (CurAmmoGear^.Kind =gtRope) and (CurAmmoGear^.Elasticity <> _0) then