594 if Gear^.Pos = posCaseUtility then |
594 if Gear^.Pos = posCaseUtility then |
595 a:= GetUtility(HH^.Hedgehog) |
595 a:= GetUtility(HH^.Hedgehog) |
596 else |
596 else |
597 a:= GetAmmo(HH^.Hedgehog) |
597 a:= GetAmmo(HH^.Hedgehog) |
598 end; |
598 end; |
599 AddAmmo(HH^.Hedgehog^, a); |
599 if Gear^.Power <> 0 then AddAmmo(HH^.Hedgehog^, a, Gear^.Power) |
|
600 else AddAmmo(HH^.Hedgehog^, a); |
600 // Possibly needs to check shared clan ammo game flag once added. |
601 // Possibly needs to check shared clan ammo game flag once added. |
601 // On the other hand, no obvious reason that clan members shouldn't know what ammo another clan member picked up |
602 // On the other hand, no obvious reason that clan members shouldn't know what ammo another clan member picked up |
602 if (not (HH^.Hedgehog^.Team^.ExtDriven |
603 if (not (HH^.Hedgehog^.Team^.ExtDriven |
603 or (HH^.Hedgehog^.BotLevel > 0))) |
604 or (HH^.Hedgehog^.BotLevel > 0))) |
604 or (HH^.Hedgehog^.Team^.Clan^.ClanIndex = LocalClan) |
605 or (HH^.Hedgehog^.Team^.Clan^.ClanIndex = LocalClan) |
605 or (GameType in [gmtDemo, gmtRecord]) then |
606 or (GameType in [gmtDemo, gmtRecord]) then |
606 begin |
607 begin |
607 s:= trammo[Ammoz[a].NameId] + ' (+' + IntToStr(Ammoz[a].NumberInCase) + ')'; |
608 if Gear^.Power <> 0 then |
|
609 s:= trammo[Ammoz[a].NameId] + ' (+' + IntToStr(Gear^.Power) + ')' |
|
610 else |
|
611 s:= trammo[Ammoz[a].NameId] + ' (+' + IntToStr(Ammoz[a].NumberInCase) + ')'; |
608 AddCaption(s, HH^.Hedgehog^.Team^.Clan^.Color, capgrpAmmoinfo); |
612 AddCaption(s, HH^.Hedgehog^.Team^.Clan^.Color, capgrpAmmoinfo); |
609 |
613 |
610 // show ammo icon |
614 // show ammo icon |
611 vga:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtAmmo); |
615 vga:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtAmmo); |
612 if vga <> nil then |
616 if vga <> nil then |