* 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"

4 files changed, 28 insertions, 40 deletions

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
     {
diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c
index c3069a1e..21db7774 100644
--- a/src/cgame/cg_tutorial.c
+++ b/src/cgame/cg_tutorial.c
@@ -582,18 +582,22 @@ static void CG_SpectatorText( char *text, playerState_t *ps )
       Q_strcat( text, MAX_TUTORIAL_TEXT,
                 va( "Press %s to switch to chase-cam spectator mode\n",
                     CG_KeyNameForCommand( "+button2" ) ) );
-    else
+    else if( cgs.clientinfo[ cg.clientNum ].team == TEAM_NONE )
       Q_strcat( text, MAX_TUTORIAL_TEXT,
                 va( "Press %s to return to free spectator mode\n",
                     CG_KeyNameForCommand( "+button2" ) ) );
-
-      Q_strcat( text, MAX_TUTORIAL_TEXT,
-          va( "Press %s or ",
-            CG_KeyNameForCommand( "weapprev" ) ) );
+    else
       Q_strcat( text, MAX_TUTORIAL_TEXT,
-          va( "%s to change player\n",
-            CG_KeyNameForCommand( "weapnext" ) ) );
-    }
+                va( "Press %s to stop following\n",
+                    CG_KeyNameForCommand( "+button2" ) ) );
+
+    Q_strcat( text, MAX_TUTORIAL_TEXT,
+        va( "Press %s or ",
+          CG_KeyNameForCommand( "weapprev" ) ) );
+    Q_strcat( text, MAX_TUTORIAL_TEXT,
+        va( "%s to change player\n",
+          CG_KeyNameForCommand( "weapnext" ) ) );
+  }
   else
   {
     Q_strcat( text, MAX_TUTORIAL_TEXT,