4 files changed, 30 insertions, 13 deletions
diff --git a/assets/ui/tremulous_alien_common_hud.h b/assets/ui/tremulous_alien_common_hud.h
index 68bc8f36..8f06a153 100644
--- a/assets/ui/tremulous_alien_common_hud.h
+++ b/assets/ui/tremulous_alien_common_hud.h
@@ -258,3 +258,16 @@ itemDef
   textStyle ITEM_TEXTSTYLE_SHADOWED
   ownerdraw CG_FOLLOW
 }
+
+//TEAM OVERLAY
+itemDef
+{
+  name "teamoverlay"
+  rect BORDER 120 160 128
+  style WINDOW_STYLE_EMPTY
+  visible MENU_TRUE
+  decoration
+  forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.75
+  textscale 1.0
+  ownerdraw CG_TEAMOVERLAY
+}
diff --git a/assets/ui/tremulous_common_hud.h b/assets/ui/tremulous_common_hud.h
index 6208f167..4ef4dbb9 100644
--- a/assets/ui/tremulous_common_hud.h
+++ b/assets/ui/tremulous_common_hud.h
@@ -165,19 +165,6 @@ itemDef
   background "ui/assets/forwardarrow.tga"
 }
 
-//TEAM OVERLAY
-itemDef
-{
-  name "teamoverlay"
-  rect BORDER 120 160 128
-  style WINDOW_STYLE_EMPTY
-  visible MENU_TRUE
-  decoration
-  forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.75
-  textscale 1.0
-  ownerdraw CG_TEAMOVERLAY
-}
-
 //SNAPSHOT
 itemDef
 {
diff --git a/assets/ui/tremulous_human_hud.menu b/assets/ui/tremulous_human_hud.menu
index e5fe27bf..707fb7b6 100644
--- a/assets/ui/tremulous_human_hud.menu
+++ b/assets/ui/tremulous_human_hud.menu
@@ -378,5 +378,18 @@
       textStyle ITEM_TEXTSTYLE_SHADOWED
       ownerdraw CG_FOLLOW
     }
+
+    //TEAM OVERLAY
+    itemDef
+    {
+      name "teamoverlay"
+      rect BORDER 120 160 128
+      style WINDOW_STYLE_EMPTY
+      visible MENU_TRUE
+      decoration
+      forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.75
+      textscale 1.0
+      ownerdraw CG_TEAMOVERLAY
+    }
   }
 }
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index f77e44a3..6609d153 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -1647,6 +1647,10 @@ static void CG_DrawTeamOverlay( rectDef_t *rect, float scale, vec4_t color )
   if( !cgs.teaminfoReceievedTime )
     return;
 
+  if( cg.showScores ||
+      cg.predictedPlayerState.pm_type == PM_INTERMISSION )
+    return;
+
   pci = cgs.clientinfo + cg.snap->ps.clientNum;
 
   for( i = 0; i < MAX_CLIENTS; i++ )