equal
deleted
inserted
replaced
27 Gear^.Message:= Gear^.Message and not gm_Slot; |
27 Gear^.Message:= Gear^.Message and not gm_Slot; |
28 |
28 |
29 if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or |
29 if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or |
30 ((MultiShootAttacks > 0) and ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NoRoundEndHint) = 0)) or |
30 ((MultiShootAttacks > 0) and ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NoRoundEndHint) = 0)) or |
31 ((Gear^.State and gstHHDriven) = 0) then exit; |
31 ((Gear^.State and gstHHDriven) = 0) then exit; |
|
32 |
|
33 if ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NoRoundEndHint) <> 0) and (MultiShootAttacks > 0) then OnUsedAmmo(PHedgehog(Gear^.Hedgehog)^); |
32 |
34 |
33 MultiShootAttacks:= 0; |
35 MultiShootAttacks:= 0; |
34 Gear^.Message:= Gear^.Message and not (gm_LJump or gm_HJump); |
36 Gear^.Message:= Gear^.Message and not (gm_LJump or gm_HJump); |
35 |
37 |
36 if CurSlot = slot then |
38 if CurSlot = slot then |
273 begin |
275 begin |
274 isInMultiShoot:= true |
276 isInMultiShoot:= true |
275 end |
277 end |
276 else |
278 else |
277 begin |
279 begin |
|
280 OnUsedAmmo(CurrentHedgehog^); |
278 if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_NoRoundEndHint) = 0 then |
281 if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_NoRoundEndHint) = 0 then |
279 begin |
282 begin |
280 TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn; |
283 TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn; |
281 State:= State or gstAttacked |
284 State:= State or gstAttacked |
282 end; |
285 end |
283 OnUsedAmmo(CurrentHedgehog^); |
286 else |
|
287 ApplyAmmoChanges(CurrentHedgehog^); |
284 end; |
288 end; |
285 end |
289 end |
286 else |
290 else |
287 begin |
291 begin |
288 OnUsedAmmo(CurrentHedgehog^); |
292 OnUsedAmmo(CurrentHedgehog^); |