From d9a102e5d0894de294925dfdaf6289d812c8ed09 Mon Sep 17 00:00:00 2001
From: RandumKiwi <RandumKiwi@users.noreply.github.com>
Date: Sat, 10 May 2008 03:56:45 +0000
Subject: [PATCH] Moved all binds from defaults into the keybind menu.

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1905 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/defaults.cfg | 28 ++--------------------------
 config/keymap.cfg   | 38 +++++++++++++++++++-------------------
 config/menus.cfg    |  2 --
 3 files changed, 21 insertions(+), 47 deletions(-)

diff --git a/config/defaults.cfg b/config/defaults.cfg
index b667696c..26195b23 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -1,5 +1,5 @@
-// these default settings get executed whenever "saved.cfg" is not available
-// do not modify anything below, instead change settings in game, or add to autoexec.cfg
+// These default settings get executed whenever "saved.cfg" is not available.
+// Do not modify anything below, instead change settings in game, or add to autoexec.cfg
 
 name "unarmed"     // change!
 
@@ -10,27 +10,11 @@ autoreload 1	   // reload the guns automatically
 
 alias maxmusicvol 120 // set higher if you want (max 255)
 
-// example WASD
-
-bind W forward
-bind A left
-bind S backward
-bind D right
-
-bind B "showmenu weapons"
-
 alias primary [ weapon (currentprimary) ]
 alias secondary [ weapon 1 ]
 alias melee [ weapon 0 ]
 alias grenades [ weapon 6 ]
 
-bind 1 primary
-bind 2 secondary
-bind 3 grenades
-bind 4 melee
-bind R reload
-bind G [ if $editing [ solid 0 ] [ quicknadethrow ] ]
-
 //for alternative weapon binding (more economic) see the end of this file
 
 lighterror 4 //set higher (for example 8) if you experience slowdown
@@ -73,7 +57,6 @@ alias zoom [
 ]
 
 //bind MOUSE2 [ zoom 1; onrelease [ zoom 0 ] ]
-bind MOUSE2 [ if $editing [ showmenu editing ] [ altaction ] ]
 
 // alternative zoom toggle
 //alias ztoggle 0
@@ -101,10 +84,6 @@ alias tosok [ votemap 11 $arg1 ]
 alias modifier 0
 alias domodifier [ alias modifier $arg1; onrelease [ alias modifier 0 ] ]
 
-bind Q [ if $editing [ domodifier 1 ] ]
-bind Z [ if $editing [ domodifier 2 ] ]
-bind X [ if $editing [ domodifier 3 ] ]
-
 alias universaldelta [
   if $editing [ alias s "edit" ] [ 
     if (alive) [ alias s "game" ] [ alias s "spect" ]
@@ -112,9 +91,6 @@ alias universaldelta [
   (concatword delta _ $s _ $modifier)
 ]
 
-bind MOUSE4 "universaldelta  1"
-bind MOUSE5 "universaldelta -1"
-
 alias delta_edit_0 [ editheight $flrceil $arg1 ]
 alias delta_edit_1 [ if $flrceil [ vdelta $arg1 ] [ vdelta (- 0 $arg1) ] ]
 alias delta_edit_2 [ edittex $flrceil $arg1 ]
diff --git a/config/keymap.cfg b/config/keymap.cfg
index 37fcfff6..73b17858 100755
--- a/config/keymap.cfg
+++ b/config/keymap.cfg
@@ -1,16 +1,16 @@
 // do not modify, use "bind" in autoexec.cfg instead
 
 keymap -1 MOUSE1 "attack"
-keymap -3 MOUSE2 "jump"
+keymap -3 MOUSE2 [ if $editing [ showmenu editing ] [ altaction ] ]
 keymap -2 MOUSE3 "weapon"
-keymap -4 MOUSE4 ""
-keymap -5 MOUSE5 ""
+keymap -4 MOUSE4 "universaldelta  1"
+keymap -5 MOUSE5 "universaldelta -1"
 keymap 8 BACKSPACE [ if $editing [ delent ] [ dropflag ] ]
 keymap 9 TAB "showscores"
 keymap 12 CLEAR ""
 keymap 13 RETURN ""
 keymap 19 PAUSE ""
-keymap 27 ESCAPE "quit"
+keymap 27 ESCAPE "showmenu main"
 keymap 32 SPACE "jump"
 keymap 33 EXCLAIM ""
 keymap 34 QUOTEDBL ""
@@ -27,10 +27,10 @@ keymap 45 MINUS ""
 keymap 46 PERIOD "equalize 2"
 keymap 47 SLASH "saycommand /"
 keymap 48 0 "weapon 0 1 2"
-keymap 49 1 "weapon 1 2 4"
-keymap 50 2 "weapon 2 1 4"
-keymap 51 3 "weapon 3 4 2"
-keymap 52 4 "weapon 4 3 2"
+keymap 49 1 "primary"
+keymap 50 2 "secondary"
+keymap 51 3 "grenades"
+keymap 52 4 "melee"
 keymap 53 5 ""
 keymap 54 6 ""
 keymap 55 7 ""
@@ -49,13 +49,13 @@ keymap 93 RIGHTBRACKET "editheight 0 1"
 keymap 94 CARET ""
 keymap 95 UNDERSCORE ""
 keymap 96 BACKQUOTE "saycommand /"
-keymap 97 A ""
-keymap 98 B ""
+keymap 97 A "left"
+keymap 98 B "showmenu weapons"
 keymap 99 C "copy"
-keymap 100 D ""
+keymap 100 D "right"
 keymap 101 E "edittoggle"
 keymap 102 F "solid 1"
-keymap 103 G "solid 0"
+keymap 103 G [ if $editing [ solid 0 ] [ quicknadethrow ] ]
 keymap 104 H "heightfield 0"
 keymap 105 I "heightfield 2"
 keymap 106 J ""
@@ -65,16 +65,16 @@ keymap 109 M ""
 keymap 110 N ""
 keymap 111 O "editheight 2 -1"
 keymap 112 P "editheight 2 1"
-keymap 113 Q ""
-keymap 114 R "recalc"
-keymap 115 S "say :)"
+keymap 113 Q [ if $editing [ domodifier 1 ] ]
+keymap 114 R "reload"
+keymap 115 S "backward"
 keymap 116 T "saycommand"
 keymap 117 U "undo"
 keymap 118 V [ if $editing [ paste ] [ showmenu voicecom ] ]
-keymap 119 W ""
-keymap 120 X "delent"
+keymap 119 W "forward"
+keymap 120 X [ if $editing [ domodifier 3 ] ]
 keymap 121 Y "saycommand %"
-keymap 122 Z ""
+keymap 122 Z [ if $editing [ domodifier 2 ] ]
 keymap 127 DELETE "edittex 0 -1"
 keymap 256 KP0 "weapon 4 1"
 keymap 257 KP1 ""
@@ -106,7 +106,7 @@ keymap 282 F1 "vote 1"
 keymap 283 F2 "vote 2"
 keymap 284 F3 ""
 keymap 285 F4 ""
-keymap 286 F5 "toggleocull"
+keymap 286 F5 "if $editing [ toggleocull ]"
 keymap 287 F6 "if $editing [ showmip ] [ if (= $followmode 0) [ followmode 1 ] [ followmode 0 ] ]"
 keymap 288 F7 "spectate"
 keymap 289 F8 "followplayer"
diff --git a/config/menus.cfg b/config/menus.cfg
index 34cb89f6..c3f0b702 100755
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -1,7 +1,5 @@
 // standard menu definitions
 
-bind ESCAPE "showmenu main"    // it all starts here
-
 newmenu main
 
 menuitem "Multiplayer"			"showmenu multiplayer"