From 6d38a73a43db7eec57cecf980eebe6e610df4de4 Mon Sep 17 00:00:00 2001
From: Leonardo Bishop <me@leonardobishop.com>
Date: Mon, 31 Jul 2023 02:37:57 +0100
Subject: Add character names

---
 code/pawn/component/camera/SpectatorCameraComponent.cs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'code/pawn/component/camera/SpectatorCameraComponent.cs')

diff --git a/code/pawn/component/camera/SpectatorCameraComponent.cs b/code/pawn/component/camera/SpectatorCameraComponent.cs
index fba33a5..3baf1a9 100644
--- a/code/pawn/component/camera/SpectatorCameraComponent.cs
+++ b/code/pawn/component/camera/SpectatorCameraComponent.cs
@@ -47,7 +47,7 @@ public partial class SpectatorCameraComponent : BaseCameraComponent
 
 	private List<IClient> GetTargets()
 	{
-		return Game.Clients.Where(c => c.Pawn is Player player && player.CurrentTeam != Team.Spectator && player.LifeState == LifeState.Alive).ToList();
+		return Game.Clients.Where(c => c.Pawn is Player player && player.Team != Team.Spectator && player.LifeState == LifeState.Alive).ToList();
 	}
 	
 	private void FindNextTarget(List<IClient> targets, bool backwards)
@@ -70,11 +70,22 @@ public partial class SpectatorCameraComponent : BaseCameraComponent
 	
 	public override float GetObservedHealth()
 	{
-		return Target?.Health ?? Entity.Health;
+		return Target?.Health ?? base.GetObservedHealth();
 	}
 
 	public override Team GetObservedTeam()
 	{
-		return Target?.CurrentTeam ?? Entity.CurrentTeam;
+		return Target?.Team ?? base.GetObservedTeam();
+	}
+	
+	public override string GetObservedName()
+	{
+		var characterName = Entity.CharacterName;
+		return string.IsNullOrWhiteSpace( characterName ) ? (Target?.Client.Name ?? "Unknown") : characterName;
+	}
+	
+	public override string GetObservedColour()
+	{
+		return Target?.HexColor ?? base.GetObservedColour();
 	}
 }
-- 
cgit v1.2.3-70-g09d2