kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve settings for crosshairs

Browse Source 
Also change resetmenu to resetcurmenu and some cleanups.
This commit is contained in:
aurhat
2016-05-22 23:06:24 +02:00
parent 3b0813412b
commit 1829ebff17
3 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/menus_edit.cfg
+10 -10
View File
@@ -112,7 +112,7 @@ menuitem "Fix heightfielding" [ solid 0; slope 0 0 ]
newmenu skymaps newmenu skymaps
menuinit [ menuinit [
resetmenu resetcurmenu
if (&& $editing (! (getautomapconfig))) [ if (&& $editing (! (getautomapconfig))) [
menuitem [Enable automapconfig to make changes permanent] [automapconfig ; closemenu (curmenu)] (concat loadsky (escape $loadsky)) menuitem [Enable automapconfig to make changes permanent] [automapconfig ; closemenu (curmenu)] (concat loadsky (escape $loadsky))
menuitem "" -1 (concat loadsky (escape $loadsky)) menuitem "" -1 (concat loadsky (escape $loadsky))
@@ -188,7 +188,7 @@ menuinit __rebuildmapmodelmenus
// Edit mapmodel slot // Edit mapmodel slot
newmenu [Edit mapmodel slot] newmenu [Edit mapmodel slot]
menuinit [ menuinit [
resetmenu resetcurmenu
if (strlen $__mmslot) [ if (strlen $__mmslot) [
push info (editmapmodelslot $__mmslot) push info (editmapmodelslot $__mmslot)
menuheader "" (concatword "edit mapmodel slot #" $__mmslot ":\n" (mapmodelslotname $__mmslot)) menuheader "" (concatword "edit mapmodel slot #" $__mmslot ":\n" (mapmodelslotname $__mmslot))
@@ -230,7 +230,7 @@ tempalias __texslot ""
// Edit texture slots // Edit texture slots
newmenu [Edit texture slots] newmenu [Edit texture slots]
menuinit [ menuinit [
resetmenu resetcurmenu
menurenderoffset -20 0 menurenderoffset -20 0
if $editing [ if $editing [
push ecurmenu (escape (curmenu)) push ecurmenu (escape (curmenu))
@@ -253,7 +253,7 @@ menuinit [
// Edit texture slot // Edit texture slot
newmenu [Edit texture slot] newmenu [Edit texture slot]
menuinit [ menuinit [
resetmenu resetcurmenu
if (strlen $__texslot) [ if (strlen $__texslot) [
push info (edittextureslot $__texslot) // "<scale> <path>" push info (edittextureslot $__texslot) // "<scale> <path>"
chmenutexture (curmenu) (at $info 1) chmenutexture (curmenu) (at $info 1)
@@ -301,7 +301,7 @@ tempalias __tex_togo ""
newmenu "Texture slot merge" newmenu "Texture slot merge"
menuinit [ menuinit [
resetmenu resetcurmenu
if (strlen $__texslot) [ if (strlen $__texslot) [
push info (edittextureslot $__texslot) // "<scale> <path>" push info (edittextureslot $__texslot) // "<scale> <path>"
chmenutexture (curmenu) (at $info 1) chmenutexture (curmenu) (at $info 1)
@@ -343,7 +343,7 @@ menuinit __rebuildtexturemenus
newmenu "Pick texture" newmenu "Pick texture"
menuinit [ menuinit [
resetmenu resetcurmenu
if (strlen $__lastwatchedtexture) [ if (strlen $__lastwatchedtexture) [
chmenutexture (curmenu) $__lastwatchedtexture chmenutexture (curmenu) $__lastwatchedtexture
push usedslots (textureslotbyname $__lastwatchedtexture) push usedslots (textureslotbyname $__lastwatchedtexture)
@@ -389,7 +389,7 @@ tempalias __sndslot ""
newmenu "Pick mapsound" newmenu "Pick mapsound"
menuinit [ menuinit [
resetmenu resetcurmenu
if (strlen $__lastwatchedmapsound) [ if (strlen $__lastwatchedmapsound) [
push usedslots (mapsoundslotbyname $__lastwatchedmapsound) push usedslots (mapsoundslotbyname $__lastwatchedmapsound)
menuitem (concat "Mapsound:" $__lastwatchedmapsound) -1 menuitem (concat "Mapsound:" $__lastwatchedmapsound) -1
@@ -417,7 +417,7 @@ menuinit [
// Edit mapsound slots // Edit mapsound slots
newmenu [Edit mapsound slots] newmenu [Edit mapsound slots]
menuinit [ menuinit [
resetmenu resetcurmenu
if $editing [ if $editing [
push info "" push info ""
loop i 256 [ loop i 256 [
@@ -438,7 +438,7 @@ tempalias __snd_vol "255"
newmenu [Edit mapsound slot] newmenu [Edit mapsound slot]
menuinit [ menuinit [
resetmenu resetcurmenu
if (strlen $__sndslot) [ if (strlen $__sndslot) [
push info (editmapsoundslot $__sndslot) // "<path> <maxuses>" push info (editmapsoundslot $__sndslot) // "<path> <maxuses>"
menuheader "" (concatword "edit mapsound slot #" $__sndslot ":\n" (at $info 0)) 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 // deleted entities
newmenu "deleted entities" newmenu "deleted entities"
menuinit [ menuinit [
resetmenu resetcurmenu
if (unlistdeletedentity) [ if (unlistdeletedentity) [
push i 0 push i 0
looplist (getdeletedentities) [type x y z a1 a2 a3 a4 a5 a6 a7] [ looplist (getdeletedentities) [type x y z a1 a2 a3 a4 a5 a6 a7] [
config/menus_settings.cfg
+21 -18
View File
@@ -283,22 +283,25 @@ menuitemtextinput [Mouse Acceleration: ] "$mouseaccel" [ mous
menuitemtextinput [Filter mouse (for bad ones): ] "$mfilter" [ mfilter $arg1 ] menuitemtextinput [Filter mouse (for bad ones): ] "$mfilter" [ mfilter $arg1 ]
menuitemtextinput [Sniper-scope sensitivity scale: ] "$scopesensscale" [ scopesensscale $arg1 ] menuitemtextinput [Sniper-scope sensitivity scale: ] "$scopesensscale" [ scopesensscale $arg1 ]
menuitem [] -1 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 ] menuitemslider [Crosshair size: ] 0 50 "$crosshairsize" 5 [] [ crosshairsize $arg1 ]
menuitem [Change crosshair... ] [ showmenu Crosshairs ] menuitem [Change default crosshair... ] [ tempalias __crosshairset (findlist (__crosshairlist) default); showmenu Crosshairs ]
menuitem [Change scope crosshair... ] [ showmenu [Scope crosshairs] ] menuitem [Change scope crosshair... ] [ tempalias __crosshairset (findlist (__crosshairlist) scope); showmenu Crosshairs ]
menuitem [Change crosshair in edit mode... ] [ showmenu [Edit mode 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 newmenu Crosshairs
menudirlist "packages/crosshairs" png [ loadcrosshair default (concatword $arg1 .png) ] 1 menuinit [
menuinit [sleep 1 menuselectionpersistent] resetcurmenu
menuheader "" (concatword "'" (at (__crosshairlist) $__crosshairset) "' crosshair")
newmenu [Scope crosshairs] menudirlist "packages/crosshairs" png [ loadcrosshair (at (__crosshairlist) $__crosshairset) (concatword $arg1 .png) ] 1
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]
newmenu [Alternate edit binds] newmenu [Alternate edit binds]
menuitem [Back] [ closecurmenu ] menuitem [Back] [ closecurmenu ]
@@ -706,7 +709,7 @@ tempalias __pckserv ""
newmenu "Autodownload config" newmenu "Autodownload config"
menuinit [ menuinit [
resetmenu resetcurmenu
push serverlist (getpckserver) push serverlist (getpckserver)
push words (listlen $serverlist) push words (listlen $serverlist)
if (! $words) [ if (! $words) [
@@ -734,7 +737,7 @@ menuinit [
newmenu "Configure package server" newmenu "Configure package server"
menuinit [ menuinit [
resetmenu resetcurmenu
if (!= (listlen $__pcksrv) 4) [ if (!= (listlen $__pcksrv) 4) [
menuitem "----- no server selected ------" -1 menuitem "----- no server selected ------" -1
] [ ] [
@@ -760,7 +763,7 @@ tempalias __zip ""
newmenu "Mod package" newmenu "Mod package"
menuinit [ menuinit [
resetmenu resetcurmenu
menurenderoffset -20 0 menurenderoffset -20 0
push ecurmenu (escape (curmenu)) push ecurmenu (escape (curmenu))
push activezips (zipmodlist active) push activezips (zipmodlist active)
@@ -787,7 +790,7 @@ menuinit [
newmenu "Configure mod package" newmenu "Configure mod package"
menuinit [ menuinit [
resetmenu resetcurmenu
menurenderoffset -20 0 menurenderoffset -20 0
push ecurmenu (escape (curmenu)) push ecurmenu (escape (curmenu))
push activezips (zipmodlist active) push activezips (zipmodlist active)
@@ -813,7 +816,7 @@ menuinit [
newmenu "Show files in package" newmenu "Show files in package"
menuinit [ menuinit [
resetmenu resetcurmenu
if (strlen $__zip) [ if (strlen $__zip) [
menuitem (concat "Files in package\f9" $__zip) -1 menuitem (concat "Files in package\f9" $__zip) -1
menuitem "" -1 menuitem "" -1
config/scripts.cfg
+1 -1
View File
@@ -64,7 +64,7 @@ const editmapmsg [ editsvar mapmsg ]
const return [ result $arg1 ] const return [ result $arg1 ]
const run [ exec (concatword config/ $arg1 .cfg) ] const run [ exec (concatword config/ $arg1 .cfg) ]
const closecurmenu [ closemenu (curmenu) ] const closecurmenu [ closemenu (curmenu) ]
const resetmenu [ delmenu (curmenu) ; newmenu (curmenu) ] const resetcurmenu [ delmenu (curmenu) ; newmenu (curmenu) ]
// Auto-completions // Auto-completions
const mapcomplete [complete $arg1 "packages/maps/official packages/maps" cgz] const mapcomplete [complete $arg1 "packages/maps/official packages/maps" cgz]