equal
deleted
inserted
replaced
240 begin |
240 begin |
241 State:= State and not gstAttacking; |
241 State:= State and not gstAttacking; |
242 if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_Utility) = 0 then |
242 if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_Utility) = 0 then |
243 begin |
243 begin |
244 Inc(AttacksNum); |
244 Inc(AttacksNum); |
245 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or |
245 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) then |
246 ((GameFlags and gfMultiWeapon) <> 0) then |
246 AddCaption(inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn+1-AttacksNum)+' '+trmsg[sidRemaining], $FFFFFF, capgrpAmmostate); |
247 begin |
247 isInMultiShoot:= (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or |
248 AddCaption(inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn+1-AttacksNum)+' '+trmsg[sidRemaining], $FFFFFF, capgrpAmmostate); |
248 ((GameFlags and gfMultiWeapon) <> 0) |
249 isInMultiShoot:= true |
|
250 end |
|
251 else |
249 else |
252 begin |
250 begin |
253 TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn; |
251 TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn; |
254 State:= State or gstAttacked; |
252 State:= State or gstAttacked; |
255 OnUsedAmmo(CurrentHedgehog^); |
253 OnUsedAmmo(CurrentHedgehog^); |