hedgewars/uGears.pas
branchhedgeroid
changeset 5932 5164d17b6374
parent 5872 454f246fe4c5
child 5958 f9e3033d929f
equal deleted inserted replaced
5828:667fb58d7f18 5932:5164d17b6374
   601             Gear^.IntersectGear^.IntersectGear:= nil;
   601             Gear^.IntersectGear^.IntersectGear:= nil;
   602     end
   602     end
   603 else if Gear^.Kind = gtHedgehog then
   603 else if Gear^.Kind = gtHedgehog then
   604     if (CurAmmoGear <> nil) and (CurrentHedgehog^.Gear = Gear) then
   604     if (CurAmmoGear <> nil) and (CurrentHedgehog^.Gear = Gear) then
   605         begin
   605         begin
       
   606         AttackBar:= 0;
   606         Gear^.Message:= gmDestroy;
   607         Gear^.Message:= gmDestroy;
   607         CurAmmoGear^.Message:= gmDestroy;
   608         CurAmmoGear^.Message:= gmDestroy;
   608         exit
   609         exit
   609         end
   610         end
   610     else
   611     else
   618             end;
   619             end;
   619 
   620 
   620         team:= Gear^.Hedgehog^.Team;
   621         team:= Gear^.Hedgehog^.Team;
   621         if CurrentHedgehog^.Gear = Gear then
   622         if CurrentHedgehog^.Gear = Gear then
   622             begin
   623             begin
       
   624             AttackBar:= 0;
   623             FreeActionsList; // to avoid ThinkThread on drawned gear
   625             FreeActionsList; // to avoid ThinkThread on drawned gear
   624             if ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) and (CurrentHedgehog^.MultiShootAttacks > 0) then OnUsedAmmo(CurrentHedgehog^);
   626             if ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) and (CurrentHedgehog^.MultiShootAttacks > 0) then OnUsedAmmo(CurrentHedgehog^);
   625             end;
   627             end;
   626 
   628 
   627         Gear^.Hedgehog^.Gear:= nil;
   629         Gear^.Hedgehog^.Gear:= nil;
  1653 end;
  1655 end;
  1654 
  1656 
  1655 procedure ResurrectHedgehog(gear: PGear);
  1657 procedure ResurrectHedgehog(gear: PGear);
  1656 var tempTeam : PTeam;
  1658 var tempTeam : PTeam;
  1657 begin
  1659 begin
       
  1660     AttackBar:= 0;
  1658     gear^.dX := _0;
  1661     gear^.dX := _0;
  1659     gear^.dY := _0;
  1662     gear^.dY := _0;
  1660     gear^.Damage := 0;
  1663     gear^.Damage := 0;
  1661     gear^.Health := gear^.Hedgehog^.InitialHealth;
  1664     gear^.Health := gear^.Hedgehog^.InitialHealth;
  1662     gear^.Hedgehog^.Effects[hePoisoned] := false;
  1665     gear^.Hedgehog^.Effects[hePoisoned] := false;