commit 3bc4cfcf875fe4648e2d29e4b949a58a9a707fe7
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Apr 30 00:58:23 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Wed Apr 30 00:58:23 2014 -0400

    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.
---
 src/strife/g_game.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/strife/g_game.c b/src/strife/g_game.c
index f90034ff..d1778e11 100644
--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -487,7 +487,8 @@ void G_BuildTiccmd (ticcmd_t* cmd, int maketic)
     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