equal
deleted
inserted
replaced
395 |
395 |
396 ApplyAngleBounds(Hedgehog, CurWeapon^.AmmoType); |
396 ApplyAngleBounds(Hedgehog, CurWeapon^.AmmoType); |
397 |
397 |
398 with CurWeapon^ do |
398 with CurWeapon^ do |
399 begin |
399 begin |
400 s:= trammo[Ammoz[AmmoType].NameId]; |
400 if length(trluaammo[Ammoz[AmmoType].NameId]) > 0 then |
|
401 s:= trluaammo[Ammoz[AmmoType].NameId] |
|
402 else |
|
403 s:= trammo[Ammoz[AmmoType].NameId]; |
401 if (Count <> AMMO_INFINITE) and (not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0))) then |
404 if (Count <> AMMO_INFINITE) and (not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0))) then |
402 s:= s + ansistring(' (' + IntToStr(Count) + ')'); |
405 s:= s + ansistring(' (' + IntToStr(Count) + ')'); |
403 if (Propz and ammoprop_Timerable) <> 0 then |
406 if (Propz and ammoprop_Timerable) <> 0 then |
404 s:= s + ansistring(', ' + IntToStr(Timer div 1000) + ' ') + trammo[sidSeconds]; |
407 s:= s + ansistring(', ' + IntToStr(Timer div 1000) + ' ') + trammo[sidSeconds]; |
405 AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo); |
408 AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo); |