summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--setup/joystick.c4
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;