hedgewars/uGears.pas
changeset 1868 2fe8d045f6a1
parent 1867 2fc0e1e39b11
child 1869 490005509a7b
equal deleted inserted replaced
1867:2fc0e1e39b11 1868:2fe8d045f6a1
   432 	if Gear^.Kind = gtHedgehog then
   432 	if Gear^.Kind = gtHedgehog then
   433 		begin
   433 		begin
   434 		if (Gear^.Damage <> 0) and
   434 		if (Gear^.Damage <> 0) and
   435 		(not Gear^.Invulnerable) then
   435 		(not Gear^.Invulnerable) then
   436 			begin
   436 			begin
       
   437             if (PHedgehog(Gear^.Hedgehog)^.Team = CurrentTeam) then
       
   438                 Gear^.State:= Gear^.State or gstLoser;
   437 			CheckNoDamage:= false;
   439 			CheckNoDamage:= false;
   438 			uStats.HedgehogDamaged(Gear);
   440 			uStats.HedgehogDamaged(Gear);
   439 			dmg:= Gear^.Damage;
   441 			dmg:= Gear^.Damage;
   440 			if Gear^.Health < dmg then
   442 			if Gear^.Health < dmg then
   441 				Gear^.Health:= 0
   443 				Gear^.Health:= 0
  1335 						if ((Mask and EXPLDoNotTouchHH) = 0) or (Gear^.Kind <> gtHedgehog) then
  1337 						if ((Mask and EXPLDoNotTouchHH) = 0) or (Gear^.Kind <> gtHedgehog) then
  1336 							begin
  1338 							begin
  1337 							DeleteCI(Gear);
  1339 							DeleteCI(Gear);
  1338 							Gear^.dX:= Gear^.dX + SignAs(_0_005 * dmg + cHHKick, Gear^.X - int2hwFloat(X));
  1340 							Gear^.dX:= Gear^.dX + SignAs(_0_005 * dmg + cHHKick, Gear^.X - int2hwFloat(X));
  1339 							Gear^.dY:= Gear^.dY + SignAs(_0_005 * dmg + cHHKick, Gear^.Y - int2hwFloat(Y));
  1341 							Gear^.dY:= Gear^.dY + SignAs(_0_005 * dmg + cHHKick, Gear^.Y - int2hwFloat(Y));
  1340 							Gear^.State:= Gear^.State or gstMoving;
  1342 							Gear^.State:= (Gear^.State or gstMoving) and (not gstLoser);
  1341 							if not Gear^.Invulnerable then
  1343 							if not Gear^.Invulnerable then
  1342 								Gear^.State:= (Gear^.State or gstMoving) and (not gstLoser);
  1344 								Gear^.State:= (Gear^.State or gstMoving) and (not gstWinner);
  1343 							Gear^.Active:= true;
  1345 							Gear^.Active:= true;
  1344 							FollowGear:= Gear
  1346 							FollowGear:= Gear
  1345 							end;
  1347 							end;
  1346 						end;
  1348 						end;
  1347 				gtGrave: begin
  1349 				gtGrave: begin