From e963adc1cfab9e52788b11de1540380c189b32eb Mon Sep 17 00:00:00 2001
From: RattleSN4K3 <RattleSN4K3@gmail.com>
Date: Sat, 30 Apr 2016 17:05:18 +0200
Subject: [PATCH] Don't draw beacons if view target is related to it

---
 .../Src/SpectatorUI/Classes/SpectatorUI_Interaction.uc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/UTGame/Src/SpectatorUI/Classes/SpectatorUI_Interaction.uc b/UTGame/Src/SpectatorUI/Classes/SpectatorUI_Interaction.uc
index f5fd0f6..ee01a0b 100644
--- a/UTGame/Src/SpectatorUI/Classes/SpectatorUI_Interaction.uc
+++ b/UTGame/Src/SpectatorUI/Classes/SpectatorUI_Interaction.uc
@@ -202,11 +202,17 @@ event PostRender(Canvas Canvas) {
         if (!LP.GetActorVisibility(A)) continue;
 
         if (UTPawn(A) != None) {
-            UTPawn_PostRenderFor(UTPawn(A), Outer, Canvas, Loc, Dir);
+            // don't draw player beacon if it's the current view target
+            if (A != ViewTarget) {
+                UTPawn_PostRenderFor(UTPawn(A), Outer, Canvas, Loc, Dir);
+            }
         } else if (UTVehicle(A) != None) {
             UTVehicle_PostRenderFor(UTVehicle(A), Outer, Canvas, Loc, Dir);
         } else if (UTOnslaughtFlag(A) != None) {
-            UTOnslaughtFlag_PostRenderFor(UTOnslaughtFlag(A), Outer, Canvas, Loc, Dir);
+            // don't draw Orb beacon if the current view target is holding it
+            if (Outer.ViewTarget == none || UTOnslaughtFlag(A).Holder != Outer.ViewTarget) {
+                UTOnslaughtFlag_PostRenderFor(UTOnslaughtFlag(A), Outer, Canvas, Loc, Dir);
+            }
         }
     }
     RenderPickupTimers(Canvas);