hedgewars/GSHandlers.inc
changeset 6325 cdd3d8c723ec
parent 6314 b4fc5b863f5f
child 6368 cd819d9df6f6
equal deleted inserted replaced
6324:53e0d825cc25 6325:cdd3d8c723ec
  3652     HHGear^.State := HHGear^.State or gstMoving;
  3652     HHGear^.State := HHGear^.State or gstMoving;
  3653 
  3653 
  3654     Gear^.X := HHGear^.X;
  3654     Gear^.X := HHGear^.X;
  3655     Gear^.Y := HHGear^.Y;
  3655     Gear^.Y := HHGear^.Y;
  3656     // For some reason I need to reapply followgear here, something else grabs it otherwise.
  3656     // For some reason I need to reapply followgear here, something else grabs it otherwise.
  3657     if not bShowAmmoMenu and not CurrentTeam^.ExtDriven then FollowGear := HHGear;
  3657     // This is probably not needed anymore
       
  3658     if not CurrentTeam^.ExtDriven then FollowGear := HHGear;
  3658 
  3659 
  3659     if not isUnderWater and hasBorder and ((HHGear^.X < _0) or (hwRound(HHGear^.X) > LAND_WIDTH)) then HHGear^.dY.isNegative:= false;
  3660     if not isUnderWater and hasBorder and ((HHGear^.X < _0) or (hwRound(HHGear^.X) > LAND_WIDTH)) then HHGear^.dY.isNegative:= false;
  3660     if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
  3661     if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
  3661 
  3662 
  3662     if // (Gear^.Health = 0)
  3663     if // (Gear^.Health = 0)
  3783     HHGear^.State := HHGear^.State or gstMoving;
  3784     HHGear^.State := HHGear^.State or gstMoving;
  3784 
  3785 
  3785     Gear^.X := HHGear^.X;
  3786     Gear^.X := HHGear^.X;
  3786     Gear^.Y := HHGear^.Y - int2hwFloat(32);
  3787     Gear^.Y := HHGear^.Y - int2hwFloat(32);
  3787     // For some reason I need to reapply followgear here, something else grabs it otherwise.
  3788     // For some reason I need to reapply followgear here, something else grabs it otherwise.
  3788     if not bShowAmmoMenu then FollowGear := HHGear;
  3789     // this is probably not needed anymore
       
  3790     if not CurrentTeam^.ExtDriven then FollowGear := HHGear;
  3789 
  3791 
  3790     if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
  3792     if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
  3791 
  3793 
  3792     if  (Gear^.Health = 0)
  3794     if  (Gear^.Health = 0)
  3793        or (HHGear^.Damage <> 0)
  3795        or (HHGear^.Damage <> 0)