From e8de3bfc4aaecd5462eea46f26b1977dd21f5950 Mon Sep 17 00:00:00 2001
From: Michael Levin <risujin@fastmail.fm>
Date: Sat, 3 Oct 2009 11:31:22 +0000
Subject: * Disabled mipmaps for crosshair shaders -- should prevent them from
 going blurry or glitching sometimes * New feature: Squad Marking -- bind in
 Options -> Misc, marks teammates in your squad by displaying a triangle above
 them when they are near

---
 ui/ingame_options.menu    | 20 +++++++++++++++++++-
 ui/menudef.h              |  1 +
 ui/tremulous_common_hud.h | 10 ++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 8bcee715..8675def6 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -1320,7 +1320,25 @@
       }
     }
 
-
+    itemDef
+    {
+      name misc
+      group optionsGrp
+      type ITEM_TYPE_BIND
+      text "Toggle Squad Mark:"
+      cvar "squadmark"
+      rect SCONTENT_X (SCONTENT_Y+(12*ELEM_H)) SCONTENT_W ELEM_H
+      textalign ALIGN_RIGHT
+      textvalign VALIGN_CENTER
+      textalignx SCONTENT_OFF
+      textscale .25
+      forecolor 1 1 1 1
+      visible MENU_FALSE
+      action
+      {
+        play "sound/misc/menu1.wav";
+      }
+    }
 
 //////// SYSTEM
 
diff --git a/ui/menudef.h b/ui/menudef.h
index 6b9705e1..d5db721e 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -177,5 +177,6 @@
 
 #define CG_PLAYER_CHARGE_BAR_BG           76
 #define CG_PLAYER_CHARGE_BAR              77
+#define CG_SQUAD_MARKERS                  78
 
 #endif
diff --git a/ui/tremulous_common_hud.h b/ui/tremulous_common_hud.h
index d3208483..485cc572 100644
--- a/ui/tremulous_common_hud.h
+++ b/ui/tremulous_common_hud.h
@@ -160,3 +160,13 @@ itemDef
   ownerdraw CG_PLAYER_CROSSHAIRNAMES
   textstyle ITEM_TEXTSTYLE_SHADOWED
 }
+
+//SQUAD MARKERS
+itemDef
+{
+  name "squad-markers"
+  visible MENU_TRUE
+  forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
+  ownerdraw CG_SQUAD_MARKERS
+}
+
-- 
cgit