diff --git a/config/defaults.cfg b/config/defaults.cfg index bd232f6d..6533e193 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -30,8 +30,7 @@ soundqualityalias = 3 // Default sound is best. poniesmodeon = 0 // Reduced violence mode. __gibsgore = 1 // Default value for gibs slider. -// The code used below is for initializing the dynamic gamma system "ofc_gamma_list" alias to be stored in saved.cfg -// Initialize the list (if it doesn't already exist) using the current gamma as initial values. +// Aliases that should be stored in saved.cfg are defined below if (! (checkalias ofc_gamma_list)) [ ofc_gamma_list = "" loop ogl (listlen $defaultmaps) [ @@ -39,4 +38,5 @@ if (! (checkalias ofc_gamma_list)) [ ] ] -if (! (checkalias dyngamma)) [ dyngamma = 0 ] \ No newline at end of file +if (! (checkalias dyngamma)) [ dyngamma = 0 ] +if (! (checkalias old_editbinds)) [ old_editbinds = 1 ] \ No newline at end of file diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 570347b1..f9c86dd9 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -265,6 +265,8 @@ menuitemkeyinput "Map overview: " toggleshowmap menuitemkeyinput "Drop CTF flag: " dropflag menuitemkeyinput "Fullscreen: " fullscreenscript menuitem "" -1 +menuitemcheckbox "Use old editing binds?" [ $old_editbinds ] [ old_editbinds = $arg1 ] +menuitem "" -1 menuitem "Reset keybinds to default settings..." [ showmenu "Reset Binds" ] newmenu "Mouse" diff --git a/config/resetbinds.cfg b/config/resetbinds.cfg index 65561b53..b155c2fc 100644 --- a/config/resetbinds.cfg +++ b/config/resetbinds.cfg @@ -25,9 +25,9 @@ bind LEFTPAREN "" bind RIGHTPAREN "" bind ASTERISK "" bind PLUS "" -bind COMMA "equalize 0" +bind COMMA [ if $old_editbinds [ equalize 0 ] [ if $editing [ if (= $flrceil 0) [ equalize 0 ] [ if (= $flrceil 2) [ equalize 2 ] ] ] ] ] bind MINUS "" -bind PERIOD "equalize 2" +bind PERIOD [ if $old_editbinds [ equalize 2 ] ] bind SLASH "saycommand /" bind 0 "" bind 1 [ if $editing [ domodifier 5 ] [ primary ] ] @@ -57,12 +57,12 @@ bind B "showmenu Weapons" bind C "copy" bind D "right" bind E "edittoggle" -bind F "solid 1" -bind G [ if $editing [ solid 0 ] [ quicknadethrow ] ] -bind H "heightfield 0" -bind I "heightfield 2" +bind F [ if $old_editbinds [ solid 1 ] [ if $editing [ if (countwalls 0) [ solid 0 ] [ solid 1 ] ] ] ] +bind G [ if $old_editbinds [ if $editing [ solid 0 ] [ quicknadethrow ] ] [ quicknadethrow ] ] +bind H [ if $old_editbinds [ heightfield 0 ] [ if $editing [ if (= $flrceil 0) [ if (countwalls 2) [ solid 0 ] [ heightfield 0 ] ] [ if (= $flrceil 2) [ if (countwalls 3) [ solid 0 ] [ heightfield 2 ] ] ] ] ] ] +bind I [ if $old_editbinds [ heightfield 2 ] ] bind J "" -bind K "corner" +bind K [ if $old_editbinds [ corner ] [ if $editing [ if (countwalls 1) [ solid 0 ] [ corner ] ] ] ] bind L [ if $editing [ showmenu Lighting ] ] bind M [ if $editing [ domodifier 6 ] ] bind N ""