diff options
| author | Simon Howard | 2010-12-10 22:44:01 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-12-10 22:44:01 +0000 |
| commit | 8dab0a3e635db40359c8ddeb9afaa9eca626ee98 (patch) | |
| tree | cfd01bd0c96a97fcffad588782a5d106ca1b3d2f /src/setup/joystick.c | |
| parent | 005747a6174d2d5b72e1af196a72cafb9b801a58 (diff) | |
| parent | 678a8f9aeea9fa1966b3e8a94974688fda4d8fe1 (diff) | |
| download | chocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.tar.gz chocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.tar.bz2 chocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.zip | |
Merge from trunk. This is slightly out of date as I did the merge
several days ago.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2212
Diffstat (limited to 'src/setup/joystick.c')
| -rw-r--r-- | src/setup/joystick.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c index fbe3a3f3..0fc00ea1 100644 --- a/src/setup/joystick.c +++ b/src/setup/joystick.c @@ -65,8 +65,8 @@ static int joystick_y_invert = 0; static txt_button_t *joystick_button; static int *all_joystick_buttons[] = { - &joybstraferight, &joybstrafeleft, &joybfire, &joybspeed, - &joybuse, &joybstrafe, &joybjump + &joybstraferight, &joybstrafeleft, &joybfire, &joybspeed, + &joybuse, &joybstrafe, &joybprevweapon, &joybnextweapon, &joybjump }; // |