equal
deleted
inserted
replaced
88 or (Team^.Clan^.TurnNumber <= Ammoz[Ammo^[slot, i].AmmoType].SkipTurns)) do inc(i); |
88 or (Team^.Clan^.TurnNumber <= Ammoz[Ammo^[slot, i].AmmoType].SkipTurns)) do inc(i); |
89 |
89 |
90 if i <= cMaxSlotAmmoIndex then ammoidx:= i |
90 if i <= cMaxSlotAmmoIndex then ammoidx:= i |
91 else ammoidx:= -1 |
91 else ammoidx:= -1 |
92 end; |
92 end; |
93 if ammoidx >= 0 then CurAmmoType:= Ammo^[slot, ammoidx].AmmoType; |
93 if ammoidx >= 0 then |
|
94 begin |
|
95 CurAmmoType:= Ammo^[slot, ammoidx].AmmoType; |
|
96 if (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) then |
|
97 ShowCrosshair:= (Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0 |
|
98 else |
|
99 ShowCrosshair:= (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoCrosshair) = 0; |
|
100 end |
94 end |
101 end |
95 end; |
102 end; |
96 |
103 |
97 procedure HHSetWeapon(HHGear: PGear); |
104 procedure HHSetWeapon(HHGear: PGear); |
98 var t: LongInt; |
105 var t: LongInt; |
383 begin |
390 begin |
384 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft; |
391 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft; |
385 TurnTimeLeft:=round(Ammoz[a].TimeAfterTurn * (cGetAwayTime / 100)); |
392 TurnTimeLeft:=round(Ammoz[a].TimeAfterTurn * (cGetAwayTime / 100)); |
386 end; |
393 end; |
387 if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) then State:= State or gstAttacked; |
394 if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) then State:= State or gstAttacked; |
|
395 if (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) then |
|
396 ShowCrosshair:= (Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0 |
|
397 else |
|
398 ShowCrosshair:= (Ammoz[a].Ammo.Propz and ammoprop_NoCrosshair) = 0; |
388 if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then ApplyAmmoChanges(CurrentHedgehog^) |
399 if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then ApplyAmmoChanges(CurrentHedgehog^) |
389 end; |
400 end; |
390 end |
401 end |
391 else |
402 else |
392 begin |
403 begin |