shithub: choc

Download patch

ref: 0ec9859ec8cf39ce1223516161fb39ea44ed5c33
parent: 4fa31de5c586b93ad54ce9cbd2ddd0ddb2e839b2
author: Simon Howard <fraggle@gmail.com>
date: Mon Dec 8 15:50:06 EST 2008

Update lists of keyboard/mouse/joystick buttons.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1411

--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -66,7 +66,7 @@
 
 static int *all_joystick_buttons[] = {
         &joybstraferight, &joybstrafeleft, &joybfire, &joybspeed,
-        &joybuse, &joybstrafe,
+        &joybuse, &joybstrafe, &joybjump
 };
 
 //
--- a/src/setup/keyboard.c
+++ b/src/setup/keyboard.c
@@ -34,9 +34,14 @@
 
 static int always_run = 0;
 
-static int *allkeys[] = {&key_left, &key_right, &key_up, &key_down, 
-                         &key_strafeleft, &key_straferight, &key_fire, 
-                         &key_use, &key_strafe, &key_speed};
+static int *allkeys[] = {
+    &key_left, &key_right, &key_up, &key_down,
+    &key_strafeleft, &key_straferight, &key_strafe,
+    &key_jump, &key_fire, &key_use, &key_speed,
+    &key_flyup, &key_flydown, &key_flycenter,
+    &key_lookup, &key_lookdown, &key_lookcenter,
+    &key_invleft, &key_invright, &key_useartifact
+};
 
 static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
 {
--- a/src/setup/mouse.c
+++ b/src/setup/mouse.c
@@ -48,6 +48,7 @@
     &mousebstraferight,
     &mousebbackward,
     &mousebuse,
+    &mousebjump
 };
 
 static void MouseSetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))