Improve settings for crosshairs

Also change resetmenu to resetcurmenu and some cleanups.

config/menus_edit.cfg

@@ -112,7 +112,7 @@ menuitem "Fix heightfielding" [ solid 0; slope 0 0 ]
 
 newmenu skymaps
 menuinit [
-    resetmenu
+    resetcurmenu
     if (&& $editing (! (getautomapconfig))) [
         menuitem [Enable automapconfig to make changes permanent] [automapconfig ; closemenu (curmenu)] (concat loadsky (escape $loadsky))
         menuitem "" -1 (concat loadsky (escape $loadsky))
@@ -188,7 +188,7 @@ menuinit __rebuildmapmodelmenus
 // Edit mapmodel slot
 newmenu [Edit mapmodel slot]
 menuinit [
-    resetmenu
+    resetcurmenu
     if (strlen $__mmslot) [
         push info (editmapmodelslot $__mmslot)
         menuheader "" (concatword "edit mapmodel slot #" $__mmslot ":\n" (mapmodelslotname $__mmslot))
@@ -230,7 +230,7 @@ tempalias __texslot ""
 // Edit texture slots
 newmenu [Edit texture slots]
 menuinit [
-    resetmenu
+    resetcurmenu
     menurenderoffset -20 0
     if $editing [
         push ecurmenu (escape (curmenu))
@@ -253,7 +253,7 @@ menuinit [
 // Edit texture slot
 newmenu [Edit texture slot]
 menuinit [
-    resetmenu
+    resetcurmenu
     if (strlen $__texslot) [
         push info (edittextureslot $__texslot)   // "<scale> <path>"
         chmenutexture (curmenu) (at $info 1)
@@ -301,7 +301,7 @@ tempalias __tex_togo ""
 
 newmenu "Texture slot merge"
 menuinit [
-    resetmenu
+    resetcurmenu
     if (strlen $__texslot) [
         push info (edittextureslot $__texslot)   // "<scale> <path>"
         chmenutexture (curmenu) (at $info 1)
@@ -343,7 +343,7 @@ menuinit __rebuildtexturemenus
 
 newmenu "Pick texture"
 menuinit [
-    resetmenu
+    resetcurmenu
     if (strlen $__lastwatchedtexture) [
         chmenutexture (curmenu) $__lastwatchedtexture
         push usedslots (textureslotbyname $__lastwatchedtexture)
@@ -389,7 +389,7 @@ tempalias __sndslot ""
 
 newmenu "Pick mapsound"
 menuinit [
-    resetmenu
+    resetcurmenu
     if (strlen $__lastwatchedmapsound) [
         push usedslots (mapsoundslotbyname $__lastwatchedmapsound)
         menuitem (concat "Mapsound:" $__lastwatchedmapsound) -1
@@ -417,7 +417,7 @@ menuinit [
 // Edit mapsound slots
 newmenu [Edit mapsound slots]
 menuinit [
-    resetmenu
+    resetcurmenu
     if $editing [
         push info ""
         loop i 256 [
@@ -438,7 +438,7 @@ tempalias __snd_vol "255"
 
 newmenu [Edit mapsound slot]
 menuinit [
-    resetmenu
+    resetcurmenu
     if (strlen $__sndslot) [
         push info (editmapsoundslot $__sndslot)   // "<path> <maxuses>"
         menuheader "" (concatword "edit mapsound slot #" $__sndslot ":\n" (at $info 0))
@@ -501,7 +501,7 @@ menuitemtextinput "Make a map backup (.BAK) every: " "$numAutoSaveBackups" [ num
 // deleted entities
 newmenu "deleted entities"
 menuinit [
-    resetmenu
+    resetcurmenu
     if (unlistdeletedentity) [
         push i 0
         looplist (getdeletedentities) [type x y z a1 a2 a3 a4 a5 a6 a7] [

config/menus_settings.cfg

@@ -276,29 +276,32 @@ menuitem [] -1
 menuitem [Reset keybinds to default settings...] [ showmenu [Reset Binds] ]
 
 newmenu Mouse
-menuitemcheckbox [Invert mouse: ] "$invmouse" [ invmouse $arg1 ]
-menuitemcheckbox [Automatic Sniper-scope sensitivity: ] "$autoscopesens"  [ autoscopesens $arg1 ]
-menuitemtextinput [Mouse Sensitivity:                    ] "$sensitivity" [ sensitivity $arg1 ]
-menuitemtextinput [Mouse Acceleration:                    ] "$mouseaccel" [ mouseaccel $arg1 ]
-menuitemtextinput [Filter mouse (for bad ones):  ] "$mfilter"             [ mfilter $arg1 ]
-menuitemtextinput [Sniper-scope sensitivity scale:  ] "$scopesensscale"   [ scopesensscale $arg1 ]
+menuitemcheckbox  [Invert mouse:                          ] "$invmouse"       [ invmouse $arg1 ]
+menuitemcheckbox  [Automatic Sniper-scope sensitivity:    ] "$autoscopesens"  [ autoscopesens $arg1 ]
+menuitemtextinput [Mouse Sensitivity:                     ] "$sensitivity"    [ sensitivity $arg1 ]
+menuitemtextinput [Mouse Acceleration:                    ] "$mouseaccel"     [ mouseaccel $arg1 ]
+menuitemtextinput [Filter mouse (for bad ones):           ] "$mfilter"        [ mfilter $arg1 ]
+menuitemtextinput [Sniper-scope sensitivity scale:        ] "$scopesensscale" [ scopesensscale $arg1 ]
 menuitem [] -1
+menuitem          [Customize crosshairs...                ]                   [ showmenu [Customize crosshairs] ]
+
+const __crosshairlist [ result (listoptions crosshairnames) ]
+tempalias __crosshairset (findlist (__crosshairlist) default)
+
+newmenu [Customize crosshairs]
 menuitemslider [Crosshair size: ] 0 50 "$crosshairsize" 5 [] [ crosshairsize $arg1 ]
-menuitem [Change crosshair...                ]               [ showmenu Crosshairs ]
-menuitem [Change scope crosshair...            ]             [ showmenu [Scope crosshairs] ]
-menuitem [Change crosshair in edit mode...     ]             [ showmenu [Edit mode crosshairs] ]
+menuitem [Change default crosshair...      ]                 [ tempalias __crosshairset (findlist (__crosshairlist) default); showmenu Crosshairs ]
+menuitem [Change scope crosshair...        ]                 [ tempalias __crosshairset (findlist (__crosshairlist) scope); showmenu Crosshairs ]
+menuitem [] -1
+menuitemslider [Choose specific crosshair: ] 0 (- (listlen (__crosshairlist)) 1) "$__crosshairset" 1 (__crosshairlist) [ tempalias __crosshairset $arg1 ]
+menuitem [Change specific crosshair...     ]                 [ showmenu Crosshairs ]
 
 newmenu Crosshairs
-menudirlist "packages/crosshairs" png [ loadcrosshair default (concatword $arg1 .png) ] 1
-menuinit [sleep 1 menuselectionpersistent]
-
-newmenu [Scope crosshairs]
-menudirlist "packages/crosshairs" png [ loadcrosshair scope (concatword $arg1 .png) ] 1
-menuinit [sleep 1 menuselectionpersistent]
-
-newmenu [Edit mode crosshairs]
-menudirlist "packages/crosshairs" png [ loadcrosshair edit (concatword $arg1 .png) ] 1
-menuinit [sleep 1 menuselectionpersistent]
+menuinit [
+    resetcurmenu
+    menuheader "" (concatword "'" (at (__crosshairlist) $__crosshairset) "' crosshair")
+    menudirlist "packages/crosshairs" png [ loadcrosshair (at (__crosshairlist) $__crosshairset) (concatword $arg1 .png) ] 1
+]
 
 newmenu [Alternate edit binds]
 menuitem [Back] [ closecurmenu ]
@@ -706,7 +709,7 @@ tempalias __pckserv ""
 
 newmenu "Autodownload config"
 menuinit [
-    resetmenu
+    resetcurmenu
     push serverlist (getpckserver)
     push words (listlen $serverlist)
     if (! $words) [
@@ -734,7 +737,7 @@ menuinit [
 
 newmenu "Configure package server"
 menuinit [
-    resetmenu
+    resetcurmenu
     if (!= (listlen $__pcksrv) 4) [
         menuitem "----- no server selected ------" -1
     ] [
@@ -760,7 +763,7 @@ tempalias __zip ""
 
 newmenu "Mod package"
 menuinit [
-    resetmenu
+    resetcurmenu
     menurenderoffset -20 0
     push ecurmenu (escape (curmenu))
     push activezips (zipmodlist active)
@@ -787,7 +790,7 @@ menuinit [
 
 newmenu "Configure mod package"
 menuinit [
-    resetmenu
+    resetcurmenu
     menurenderoffset -20 0
     push ecurmenu (escape (curmenu))
     push activezips (zipmodlist active)
@@ -813,7 +816,7 @@ menuinit [
 
 newmenu "Show files in package"
 menuinit [
-    resetmenu
+    resetcurmenu
     if (strlen $__zip) [
         menuitem (concat "Files in package\f9" $__zip) -1
         menuitem "" -1

config/scripts.cfg

@@ -64,7 +64,7 @@ const editmapmsg [ editsvar mapmsg ]
 const return [ result $arg1 ]
 const run [ exec (concatword config/ $arg1 .cfg) ]
 const closecurmenu [ closemenu (curmenu) ]
-const resetmenu [ delmenu (curmenu) ; newmenu (curmenu) ]
+const resetcurmenu [ delmenu (curmenu) ; newmenu (curmenu) ]
 
 // Auto-completions
 const mapcomplete [complete $arg1 "packages/maps/official packages/maps" cgz]