equal
deleted
inserted
replaced
224 end; |
224 end; |
225 |
225 |
226 procedure SwitchNotHoldedAmmo(var Hedgehog: THedgehog); |
226 procedure SwitchNotHoldedAmmo(var Hedgehog: THedgehog); |
227 begin |
227 begin |
228 with Hedgehog do |
228 with Hedgehog do |
229 if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_DontHold) <> 0 then |
229 if ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_DontHold) <> 0) or |
|
230 (Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber > 0) then |
230 begin |
231 begin |
231 CurAmmo:= 0; |
232 CurAmmo:= 0; |
232 CurSlot:= 0; |
233 CurSlot:= 0; |
233 while (CurSlot <= cMaxSlotIndex) and (Ammo^[CurSlot, CurAmmo].Count = 0) do inc(CurSlot) |
234 while (CurSlot <= cMaxSlotIndex) and |
|
235 (Ammo^[CurSlot, CurAmmo].Count = 0) and |
|
236 (Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber > 0) |
|
237 do inc(CurSlot) |
234 end |
238 end |
235 end; |
239 end; |
236 |
240 |
237 procedure SetWeapon(weap: TAmmoType); |
241 procedure SetWeapon(weap: TAmmoType); |
238 begin |
242 begin |