shithub: choc

Download patch

ref: afb3bd1405e8c9543be4c1db529c9c8f84c6bd69
parent: ec169fd1c28b2ba3b6b6fc7e7123e9d27516dd5f
author: Simon Howard <fraggle@gmail.com>
date: Sun Jan 23 16:42:09 EST 2011

Fix default joystick buttons in setup tool to match Vanilla (thanks
twipley).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2239

--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@
      * Menu navigation when using joystick/joypad (thanks AlexXav).
      * For configuration file value for shift keys, use scan code for
        right shift, not left shift (thanks AlexXav).
+     * Default joystick buttons for the setup tool now match Vanilla
+       (thanks twipley).
 
 1.5.0 (2011-01-02):
 
--- a/setup/joystick.c
+++ b/setup/joystick.c
@@ -46,8 +46,8 @@
 
 int joybfire = 0;
 int joybstrafe = 1;
-int joybuse = 2;
-int joybspeed = 3;
+int joybuse = 3;
+int joybspeed = 2;
 int joybstrafeleft = -1;
 int joybstraferight = -1;
 int joybprevweapon = -1;