diff options
Diffstat (limited to 'src/m_controls.c')
| -rw-r--r-- | src/m_controls.c | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/src/m_controls.c b/src/m_controls.c index 73e81b1b..a71209a0 100644 --- a/src/m_controls.c +++ b/src/m_controls.c @@ -186,10 +186,10 @@ int key_menu_screenshot = 0; // Joystick controls // -int joybfire = 0; -int joybstrafe = 1; -int joybuse = 3; -int joybspeed = 2; +int joybfire = 0; +int joybstrafe = 1; +int joybuse = 3; +int joybspeed = 2; int joybstrafeleft = -1; int joybstraferight = -1; @@ -199,6 +199,8 @@ int joybjump = -1; int joybprevweapon = -1; int joybnextweapon = -1; +int joybmenu = -1; + // Control whether if a mouse button is double clicked, it acts like // "use" has been pressed @@ -210,25 +212,27 @@ int dclick_use = 1; void M_BindBaseControls(void) { - M_BindVariable("key_right", &key_right), - M_BindVariable("key_left", &key_left), - M_BindVariable("key_up", &key_up), - M_BindVariable("key_down", &key_down), - M_BindVariable("key_strafeleft", &key_strafeleft), - M_BindVariable("key_straferight", &key_straferight), - M_BindVariable("key_fire", &key_fire), - M_BindVariable("key_use", &key_use), - M_BindVariable("key_strafe", &key_strafe), - M_BindVariable("key_speed", &key_speed), - - M_BindVariable("mouseb_fire", &mousebfire), - M_BindVariable("mouseb_strafe", &mousebstrafe), - M_BindVariable("mouseb_forward", &mousebforward), - - M_BindVariable("joyb_fire", &joybfire), - M_BindVariable("joyb_strafe", &joybstrafe), - M_BindVariable("joyb_use", &joybuse), - M_BindVariable("joyb_speed", &joybspeed), + M_BindVariable("key_right", &key_right); + M_BindVariable("key_left", &key_left); + M_BindVariable("key_up", &key_up); + M_BindVariable("key_down", &key_down); + M_BindVariable("key_strafeleft", &key_strafeleft); + M_BindVariable("key_straferight", &key_straferight); + M_BindVariable("key_fire", &key_fire); + M_BindVariable("key_use", &key_use); + M_BindVariable("key_strafe", &key_strafe); + M_BindVariable("key_speed", &key_speed); + + M_BindVariable("mouseb_fire", &mousebfire); + M_BindVariable("mouseb_strafe", &mousebstrafe); + M_BindVariable("mouseb_forward", &mousebforward); + + M_BindVariable("joyb_fire", &joybfire); + M_BindVariable("joyb_strafe", &joybstrafe); + M_BindVariable("joyb_use", &joybuse); + M_BindVariable("joyb_speed", &joybspeed); + + M_BindVariable("joyb_menu_activate", &joybmenu); // Extra controls that are not in the Vanilla versions: |