From 0ca5d9e96290ce89e3f07cc65252ef60d90d68fb Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Mon, 14 Feb 2011 10:47:49 +0000
Subject: * Fix hud spectator text not displaying when using cg_stickyspec to
 follow a player who is not spawned * Fix tutorial text from suggesting that a
 player spectating a teammate while dead can "return to free spectator mode"

---
 assets/ui/tremulous_alien_common_hud.h | 16 ----------------
 assets/ui/tremulous_common_hud.h       | 16 ++++++++++++++++
 assets/ui/tremulous_human_hud.menu     | 16 ----------------
 3 files changed, 16 insertions(+), 32 deletions(-)

(limited to 'assets')

diff --git a/assets/ui/tremulous_alien_common_hud.h b/assets/ui/tremulous_alien_common_hud.h
index 8f667ceb..c77c9f77 100644
--- a/assets/ui/tremulous_alien_common_hud.h
+++ b/assets/ui/tremulous_alien_common_hud.h
@@ -243,22 +243,6 @@ itemDef
   background "ui/assets/neutral/charge_bg_h.tga"
 }
 
-//SPECTATOR TEXT
-itemDef
-{
-  name "followtext"
-  rect 200 375 240 25
-  foreColor 1 1 1 1
-  aspectBias ALIGN_CENTER
-  textalign ALIGN_CENTER
-  textvalign VALIGN_TOP
-  visible MENU_TRUE
-  decoration
-  textScale .7
-  textStyle ITEM_TEXTSTYLE_SHADOWED
-  ownerdraw CG_FOLLOW
-}
-
 //TEAM OVERLAY
 itemDef
 {
diff --git a/assets/ui/tremulous_common_hud.h b/assets/ui/tremulous_common_hud.h
index e78ea9f9..662a2bcb 100644
--- a/assets/ui/tremulous_common_hud.h
+++ b/assets/ui/tremulous_common_hud.h
@@ -206,3 +206,19 @@ itemDef
   ownerdraw CG_PLAYER_CROSSHAIR
 }
 
+//SPECTATOR TEXT
+itemDef
+{
+    name "followtext"
+    rect 200 375 240 25
+    foreColor 1 1 1 1
+    aspectBias ALIGN_CENTER
+    textalign ALIGN_CENTER
+    textvalign VALIGN_TOP
+    visible MENU_TRUE
+    decoration
+    textScale .7
+    textStyle ITEM_TEXTSTYLE_SHADOWED
+    ownerdraw CG_FOLLOW
+}
+
diff --git a/assets/ui/tremulous_human_hud.menu b/assets/ui/tremulous_human_hud.menu
index 2fc3ba4c..114214a1 100644
--- a/assets/ui/tremulous_human_hud.menu
+++ b/assets/ui/tremulous_human_hud.menu
@@ -363,22 +363,6 @@
       background "ui/assets/neutral/selected.tga"
     }
 
-    //SPECTATOR TEXT
-    itemDef
-    {
-      name "followtext"
-      rect 200 375 240 25
-      foreColor 1 1 1 1
-      aspectBias ALIGN_CENTER
-      textalign ALIGN_CENTER
-      textvalign VALIGN_TOP
-      visible MENU_TRUE
-      decoration
-      textScale .7
-      textStyle ITEM_TEXTSTYLE_SHADOWED
-      ownerdraw CG_FOLLOW
-    }
-
     //TEAM OVERLAY
     itemDef
     {
-- 
cgit