hedgewars/GSHandlers.inc
changeset 7565 00568d3054d0
parent 7539 c6ffbc6530e3
child 7564 651d56a6e568
equal deleted inserted replaced
7544:a72ace943bfd 7565:00568d3054d0
  1814                 begin
  1814                 begin
  1815                 State := State and (not gstAttacking);
  1815                 State := State and (not gstAttacking);
  1816                 Message := Message and (not gmAttack)
  1816                 Message := Message and (not gmAttack)
  1817                 end;
  1817                 end;
  1818         DeleteGear(Gear);
  1818         DeleteGear(Gear);
  1819 	exit;
  1819         exit;
  1820         end;
  1820         end;
  1821     if CheckGearDrowning(HHGear) then DeleteGear(Gear)
  1821     if CheckGearDrowning(HHGear) then DeleteGear(Gear)
  1822 end;
  1822 end;
  1823 
  1823 
  1824 procedure doStepRope(Gear: PGear);
  1824 procedure doStepRope(Gear: PGear);
  4781                 end
  4781                 end
  4782             end;
  4782             end;
  4783         Gear^.Timer:= Gear^.Tag
  4783         Gear^.Timer:= Gear^.Tag
  4784         end;
  4784         end;
  4785 
  4785 
  4786     if (Gear^.Health = 0) or (HHGear^.Damage <> 0) then
  4786     if (Gear^.Health = 0) or ((HHGear^.State and gstHHDriven) = 0) then
  4787         begin
  4787         begin
  4788         DeleteGear(Gear);
  4788         DeleteGear(Gear);
  4789         AfterAttack
  4789         AfterAttack
  4790         end
  4790         end
  4791     else
  4791     else
  4857         land^.CollisionMask:= $FF7F;
  4857         land^.CollisionMask:= $FF7F;
  4858             
  4858             
  4859         Gear^.Timer:= Gear^.Tag
  4859         Gear^.Timer:= Gear^.Tag
  4860         end;
  4860         end;
  4861 
  4861 
  4862     if (Gear^.Health = 0) or (HHGear^.Damage <> 0) or ((HHGear^.Message and gmAttack) <> 0) then
  4862     if (Gear^.Health = 0) or ((HHGear^.State and gstHHDriven) = 0) or ((HHGear^.Message and gmAttack) <> 0) then
  4863         begin
  4863         begin
  4864         HHGear^.Message:= HHGear^.Message and (not gmAttack);
  4864         HHGear^.Message:= HHGear^.Message and (not gmAttack);
  4865         DeleteGear(Gear);
  4865         DeleteGear(Gear);
  4866         AfterAttack
  4866         AfterAttack
  4867         end
  4867         end