equal
deleted
inserted
replaced
51 with HHGear^.Hedgehog^ do |
51 with HHGear^.Hedgehog^ do |
52 begin |
52 begin |
53 HHGear^.Message:= HHGear^.Message and not gmSlot; |
53 HHGear^.Message:= HHGear^.Message and not gmSlot; |
54 ammoidx:= 0; |
54 ammoidx:= 0; |
55 if ((HHGear^.State and (gstAttacking or gstAttacked)) <> 0) or |
55 if ((HHGear^.State and (gstAttacking or gstAttacked)) <> 0) or |
56 (TargetPoint.X <> NoPointX) or |
|
57 ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or |
56 ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or |
58 ((HHGear^.State and gstHHDriven) = 0) then exit; |
57 ((HHGear^.State and gstHHDriven) = 0) then exit; |
59 ChangeAmmo:= true; |
58 ChangeAmmo:= true; |
60 |
59 |
61 while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx); |
60 while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx); |