hedgewars/GSHandlers.inc
changeset 1634 486a89f0e843
parent 1633 c1de4078b0fd
child 1635 cc5976f292f9
equal deleted inserted replaced
1633:c1de4078b0fd 1634:486a89f0e843
   847 	
   847 	
   848 	if Gear^.Elasticity < _10 then
   848 	if Gear^.Elasticity < _10 then
   849 		Gear^.Elasticity:= _10000;
   849 		Gear^.Elasticity:= _10000;
   850 	end;
   850 	end;
   851 
   851 
   852 if (Gear^.Elasticity > Gear^.Friction) or ((Gear^.Message and gm_Attack) = 0) then
   852 if (Gear^.Elasticity > Gear^.Friction)
       
   853 or ((Gear^.Message and gm_Attack) = 0)
       
   854 or (HHGear^.Damage > 0) then
   853 	begin
   855 	begin
   854 	with PHedgehog(Gear^.Hedgehog)^.Gear^ do
   856 	with PHedgehog(Gear^.Hedgehog)^.Gear^ do
   855 		begin
   857 		begin
   856 		State:= State and not gstAttacking;
   858 		State:= State and not gstAttacking;
   857 		Message:= Message and not gm_Attack
   859 		Message:= Message and not gm_Attack