commit afb3bd1405e8c9543be4c1db529c9c8f84c6bd69
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Jan 23 21:42:09 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Jan 23 21:42:09 2011 +0000

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

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 2239
---
 NEWS             | 2 ++
 setup/joystick.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 56f71593..88ddd060 100644
--- 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):

diff --git a/setup/joystick.c b/setup/joystick.c
index 1fc9a7a9..fe87439c 100644
--- a/setup/joystick.c
+++ b/setup/joystick.c
@@ -46,8 +46,8 @@ int usejoystick = 0;

 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;