* cg_drawCrosshair now has 3 settings:

    0 - always off
    1 - for long range weapons only (1.1.0 behaviour and also the new default)
    2 - always on (if the weapon.cfg has one defined of course)
* cg_drawCrosshair 0 no longer prevents crosshair names from drawing
* added cg_drawCrosshair configuration in the ingame Options -> Game menu
  

1 files changed, 20 insertions, 0 deletions

diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 4874b237..e0f08aa4 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -319,6 +319,26 @@
       }
     }
 
+    itemDef
+    {
+      name game
+      group optionsGrp
+      type ITEM_TYPE_MULTI
+      text "Draw Crosshair:"
+      cvar "cg_drawCrosshair"
+      cvarFloatList { "Never" 0 "Ranged Weapons Only" 1 "Always" 2 }
+      rect 80 250 192 15
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 128 
+      textaligny 12
+      textscale .25         
+      forecolor 1 1 1 1
+      visible 0 
+      action
+      {
+        play "sound/misc/menu1.wav"; 
+      }
+    }
 
 //////// CONTROLS