diff options
| author | Leonardo Bishop <me@leonardobishop.com> | 2023-07-30 19:12:09 +0100 |
|---|---|---|
| committer | Leonardo Bishop <me@leonardobishop.com> | 2023-07-30 19:12:09 +0100 |
| commit | 4ae38adb208c435ff6a021cdd0517768c5314fe6 (patch) | |
| tree | 18ccbffd5fd3d385983ba41f3cd0031586995733 /code/ui | |
| parent | 970e3de202b1482ae72b85487414d9b933818774 (diff) | |
Add observed health and team colours to spectator mode
Diffstat (limited to 'code/ui')
| -rw-r--r-- | code/ui/PlayerInfo.razor | 9 | ||||
| -rw-r--r-- | code/ui/health/Health.razor | 6 | ||||
| -rw-r--r-- | code/ui/team/TeamInfo.razor | 6 | ||||
| -rw-r--r-- | code/ui/weapon/Reload.razor | 8 |
4 files changed, 15 insertions, 14 deletions
diff --git a/code/ui/PlayerInfo.razor b/code/ui/PlayerInfo.razor index 2acdef0..fed61c0 100644 --- a/code/ui/PlayerInfo.razor +++ b/code/ui/PlayerInfo.razor @@ -26,12 +26,13 @@ playerinfo { {
public string GetTeamColour()
{
- var ClientPawn = Game.LocalPawn;
- if (ClientPawn is Player)
+ var clientPawn = Game.LocalPawn;
+ if (clientPawn is Player {Camera: not null } player)
{
- return TeamOperations.GetTeamColour(((Player)ClientPawn).CurrentTeam);
+ var colour = TeamOperations.GetTeamColour(player.Camera.GetObservedTeam());
+ return string.IsNullOrWhiteSpace(colour) ? "white" : colour;
}
- return "";
+ return "white";
}
protected override int BuildHash()
diff --git a/code/ui/health/Health.razor b/code/ui/health/Health.razor index 8961f63..9600c8b 100644 --- a/code/ui/health/Health.razor +++ b/code/ui/health/Health.razor @@ -30,10 +30,10 @@ Health { public int GetHealth()
{
- var ClientPawn = Game.LocalPawn;
- if (ClientPawn is Player)
+ var clientPawn = Game.LocalPawn;
+ if (clientPawn is Player {Camera: not null } player)
{
- return ClientPawn.Health.CeilToInt();
+ return player.Camera.GetObservedHealth().CeilToInt();
}
return 0;
}
diff --git a/code/ui/team/TeamInfo.razor b/code/ui/team/TeamInfo.razor index 883dcf0..4451810 100644 --- a/code/ui/team/TeamInfo.razor +++ b/code/ui/team/TeamInfo.razor @@ -22,10 +22,10 @@ public string GetTeamName()
{
- var ClientPawn = Game.LocalPawn;
- if (ClientPawn is Player)
+ var clientPawn = Game.LocalPawn;
+ if (clientPawn is Player {Camera: not null } player)
{
- return TeamOperations.GetTeamName(((Player)ClientPawn).CurrentTeam);
+ return TeamOperations.GetTeamName(player.Camera.GetObservedTeam());
}
return "";
}
diff --git a/code/ui/weapon/Reload.razor b/code/ui/weapon/Reload.razor index d325ade..190a84c 100644 --- a/code/ui/weapon/Reload.razor +++ b/code/ui/weapon/Reload.razor @@ -60,11 +60,11 @@ reload { protected override int BuildHash()
{
- var localPawn = Game.LocalPawn;
- if (localPawn is Player player)
+ var clientPawn = Game.LocalPawn;
+ if (clientPawn is Player {Camera: not null } player)
{
- var inventory = player.Inventory;
- if (inventory != null && inventory.GetCurrentWeapon() != null)
+ var inventory = player.Camera.GetObservedInventory();
+ if (inventory?.GetCurrentWeapon() != null)
{
var weapon = inventory.GetCurrentWeapon();
var ammo = weapon.Ammo;
|