equal
deleted
inserted
replaced
270 if ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_DontHold) <> 0) or |
270 if ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_DontHold) <> 0) or |
271 (Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then |
271 (Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then |
272 begin |
272 begin |
273 CurAmmo:= 0; |
273 CurAmmo:= 0; |
274 CurSlot:= 0; |
274 CurSlot:= 0; |
275 while (CurSlot <= cMaxSlotIndex) and |
275 while (CurSlot <= cMaxSlotIndex) and |
276 (Ammo^[CurSlot, CurAmmo].Count = 0) and |
276 ((Ammo^[CurSlot, CurAmmo].Count = 0) or |
277 (Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) |
277 (Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0)) |
278 do inc(CurSlot) |
278 do inc(CurSlot) |
279 end |
279 end |
280 end; |
280 end; |
281 |
281 |
282 procedure SetWeapon(weap: TAmmoType); |
282 procedure SetWeapon(weap: TAmmoType); |