From 31214c822928034a9c5fab97404cdbb0407e5cc4 Mon Sep 17 00:00:00 2001 From: Bukz Date: Sun, 16 Sep 2012 13:34:34 +0000 Subject: [PATCH] cleanup git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6880 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus_edit.cfg | 1 + config/menus_settings.cfg | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index bc3d97b3..931f6539 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -428,6 +428,7 @@ menuitemslider "Sound volume: " 1 255 "$ambientsoundvol" 5 "" [ ambientsoundvol menuitem " 2 [ OK ]" [ newent sound $ambientsoundmenu $soundrad $soundsize $ambientsoundvol ] newmenu "Editing settings" +menuitemslider "Grid/Selection style: " 0 1 "$oldselstyle" 1 [ "triangles" "squares (default)" ] [ oldselstyle $arg1 ] menuitemslider "Fly speeds multiplier: " 1 5 "$flyspeed" 1 "" [ flyspeed $arg1 ] menuitemcheckbox "Enable auto save map: " "result $autosavemap" [ autosavemap = $arg1 ] menuitemslider "Time between auto saves (in milliseconds): " 30000 600000 "$timeBetAutoSaves" 30000 [] [ timeBetAutoSaves = $arg1 ] diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index fe915e55..9289d884 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -371,6 +371,10 @@ if (! (checkalias nickhighlight)) [ nickhighlight = 0 ] const default_bursts "3 2 2" newmenu "Weapon Settings" +menuitemcheckbox "Auto weapon reload: " "$autoreload" [ autoreload $arg1 ] +menuitemcheckbox "Hit sound: " "$hitsound" [ hitsound $arg1 ] +menuitemcheckbox "Auto switch to akimbo upon pickup: " "$akimboautoswitch" [ akimboautoswitch $arg1 ] +menuitemslider "Akimbo end action: " 0 2 "$akimboendaction" 1 [ "Switch to pistol" "Switch to primary weapon" "Switch to grenades" ] [ akimboendaction $arg1 ] menuitemcheckbox "SMG - Full Auto?" "(= (burstshots $SMG) 0)" [ if (= $arg1 0) [ burstshots $SMG (at $default_bursts 0) ] [ burstshots $SMG 0 ] ] menuitemcheckbox "AR - Full Auto?" "(= (burstshots $AR) 0)" [ if (= $arg1 0) [ burstshots $AR (at $default_bursts 1) ] [ burstshots $AR 0 ] ] menuitemcheckbox "Akimbo - Full Auto?" "(= (burstshots $AKIMBO) 0)" [ if (= $arg1 0) [ burstshots $AKIMBO (at $default_bursts 2) ] [ burstshots $AKIMBO 0 ] ] @@ -379,25 +383,19 @@ menuitemslider "AR - Shots per burst: " 0 14 "(burstshots $AR)" 1 "" [ burstshot menuitemslider "Akimbo - Shots per burst: " 0 19 "(burstshots $AKIMBO)" 1 "" [ burstshots $AKIMBO $arg1 ] newmenu gameplay - menuitemtextinput "Nickname: " "result $curname" [ name $arg1 ] menuitemslider "Player skins: " 0 2 "$teamdisplaymode" 1 [ Normal "Colored vests" "Full color" ] [ teamdisplaymode $arg1 ] menuitemslider "Custom player skins: " 0 2 "$hidecustomskins" 1 [ "Always show" "Show in non-team modes" "Never show" ] [ hidecustomskins $arg1 ] menuitem "" -1 menuitemcheckbox "Reduced violence mode: " "$poniesmodeon" [ reducedviolencemode $arg1 ] -menuitemcheckbox "Auto weapon reload: " "$autoreload" [ autoreload $arg1 ] menuitemslider "Gib gore: " 0 4 "$__gibsgore" 1 [ "Off" "Normal" "Good" "Messy" "Unrealistic" ] [ gibsgore $arg1 ] menuitemslider "Name highlight color: " 0 9 "$nickhighlight" 1 [ " 0green 5(default)" " 1blue" " 2yellow" " 3red" " 4gray" "white" " 6dark brown" " 7dark red" " 8purple" " 9orange" ] [ nickhighlight = $arg1; HIGHLIGHT = (c $nickhighlight) ] -menuitemcheckbox "Hit sound: " "$hitsound" [ hitsound $arg1 ] menuitemcheckbox "Show scores on death: " "$showscoresondeath" [ showscoresondeath $arg1 ] menuitem "Change to the enemy team" [ changeteam ] menuitem "Change weapon..." [ showmenu Weapons ] menuitem "Change player skin..." [ showmenu (at [CLA RVSF] (curteam)) ] menuitem "Weapon settings..." [ showmenu "Weapon Settings" ] menuitem "Edit kill messages..." [ showmenu "Kill Messages" ] -menuitemcheckbox "Auto switch to akimbo upon pickup: " "$akimboautoswitch" [ akimboautoswitch $arg1 ] -menuitemslider "Akimbo end action: " 0 2 "$akimboendaction" 1 [ "Switch to pistol" "Switch to primary weapon" "Switch to grenades" ] [ akimboendaction $arg1 ] -menuitemslider "Fly speeds multiplier: " 1 5 "$flyspeed" 1 "" [ flyspeed $arg1 ] __fontsetting = 0 // Initial setting for status of fonts so AC doesn't give errors. __screenshottype = 0 // Initial setting for status of fonts so AC doesn't give errors. @@ -414,7 +412,6 @@ menuitemslider "Screenshot type: " -1 4 "$__screenshottype" 1 [ "JPEG (Terrible menuitemslider "Console size: " 0 20 "$consize" 1 "" [ consize $arg1 ] menuitemslider "Font type: " 0 2 "$__fontsetting" 1 [ "Default" "Serif" "Monospace" ] [ if (= $arg1 1) [ setfont serif; __fontsetting = 1 ] [ if (= $arg1 2) [ setfont mono; __fontsetting = 2 ] [ setfont default; __fontsetting = 0 ] ] ] menuitemslider "Mini-map background style: " 0 2 "$showmapbackdrop" 1 [ "Fully Transparent" "Black" "White/Transparent" ] [ showmapbackdrop $arg1 ] -menuitemslider "Grid/Selection style: " 0 1 "$oldselstyle" 1 [ "triangles" "squares (default)" ] [ oldselstyle $arg1 ] menuitemcheckbox "Enable compatibility with older cubescripts " "$compatibilitymode" [ compatibilitymode $arg1; echo (c 3) This setting requires a restart to take effect. ] menuitemcheckbox "Enable per-official map dynamic gamma: " "$dyngamma" [ dyngamma = $arg1 ] menuitemtextinput "Set default gamma for this map: " "(at $ofc_gamma_list (findlist $defaultmaps (curmap 1)))" [ setgamma $arg1 ]