equal
deleted
inserted
replaced
302 begin |
302 begin |
303 Inc(MultiShootAttacks); |
303 Inc(MultiShootAttacks); |
304 |
304 |
305 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) then |
305 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) then |
306 begin |
306 begin |
307 s:= inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn + 1 - MultiShootAttacks); |
307 s:= inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn - MultiShootAttacks + 1); |
308 AddCaption(format(trmsg[sidRemaining], s), cWhiteColor, capgrpAmmostate); |
308 AddCaption(format(trmsg[sidRemaining], s), cWhiteColor, capgrpAmmostate); |
309 end; |
309 end; |
310 |
310 |
311 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) or |
311 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) or |
312 ((GameFlags and gfMultiWeapon) <> 0) then |
312 ((GameFlags and gfMultiWeapon) <> 0) then |
452 if isCursorVisible then |
452 if isCursorVisible then |
453 with PHedgehog(Gear^.Hedgehog)^ do |
453 with PHedgehog(Gear^.Hedgehog)^ do |
454 with Ammo^[CurSlot, CurAmmo] do |
454 with Ammo^[CurSlot, CurAmmo] do |
455 begin |
455 begin |
456 if (Gear^.Message and gm_Left ) <> 0 then |
456 if (Gear^.Message and gm_Left ) <> 0 then |
457 Pos:= (Pos + Ammoz[AmmoType].PosCount - 1) mod Ammoz[AmmoType].PosCount |
457 Pos:= (Pos - 1 + Ammoz[AmmoType].PosCount) mod Ammoz[AmmoType].PosCount |
458 else |
458 else |
459 if (Gear^.Message and gm_Right ) <> 0 then |
459 if (Gear^.Message and gm_Right ) <> 0 then |
460 Pos:= (Pos + 1) mod Ammoz[AmmoType].PosCount |
460 Pos:= (Pos + 1) mod Ammoz[AmmoType].PosCount |
461 else exit; |
461 else exit; |
462 StepTicks:= 200; |
462 StepTicks:= 200; |