shithub: choc

Download patch

ref: 3bc4cfcf875fe4648e2d29e4b949a58a9a707fe7
parent: eebddb1fff7d6b87ef7938881b2e5c9fdb702dad
author: Simon Howard <fraggle@gmail.com>
date: Tue Apr 29 20:58:23 EDT 2014

strife: Fix joystick jump button.

The code to handle the joystick jump button variable was not
implemented. Check the jump button on the joystick as well as the
keyboard and mouse button equivalents when deciding whether to set
the jump bit.

--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -487,7 +487,8 @@
     cmd->chatchar = HU_dequeueChatChar(); 
 
     // villsa [STRIFE] - add mouse button support for jump
-    if(gamekeydown[key_jump] || mousebuttons[mousebjump])
+    if (gamekeydown[key_jump] || mousebuttons[mousebjump]
+     || joybuttons[joybjump])
         cmd->buttons2 |= BT2_JUMP;
  
     // villsa [STRIFE]: Moved mousebuttons[mousebfire] to below