diff options
| author | Simon Howard | 2014-04-30 00:58:23 -0400 |
|---|---|---|
| committer | Simon Howard | 2014-04-30 00:58:23 -0400 |
| commit | 3bc4cfcf875fe4648e2d29e4b949a58a9a707fe7 (patch) | |
| tree | c0a65b80cee43527fef908a7163c0d8712177496 /src | |
| parent | eebddb1fff7d6b87ef7938881b2e5c9fdb702dad (diff) | |
| download | chocolate-doom-3bc4cfcf875fe4648e2d29e4b949a58a9a707fe7.tar.gz chocolate-doom-3bc4cfcf875fe4648e2d29e4b949a58a9a707fe7.tar.bz2 chocolate-doom-3bc4cfcf875fe4648e2d29e4b949a58a9a707fe7.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/strife/g_game.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |