diff options
| author | Simon Howard | 2011-02-12 15:38:08 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-02-12 15:38:08 +0000 |
| commit | a9996b41e954d85fde5ec5188bbf6a7f4df88011 (patch) | |
| tree | 113669ff889c9184aaa28224317c8b04c2c5bfeb /src/doom/m_menu.c | |
| parent | 7d7b5087d2288fc6e2493448968f7d786043b389 (diff) | |
| parent | a366f68b2959282b22ab6f08569a253f0540745c (diff) | |
| download | chocolate-doom-a9996b41e954d85fde5ec5188bbf6a7f4df88011.tar.gz chocolate-doom-a9996b41e954d85fde5ec5188bbf6a7f4df88011.tar.bz2 chocolate-doom-a9996b41e954d85fde5ec5188bbf6a7f4df88011.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2258
Diffstat (limited to 'src/doom/m_menu.c')
| -rw-r--r-- | src/doom/m_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c index 3bb4baa3..478e7f66 100644 --- a/src/doom/m_menu.c +++ b/src/doom/m_menu.c @@ -1442,23 +1442,23 @@ boolean M_Responder (event_t* ev) if (ev->type == ev_joystick && joywait < I_GetTime()) { - if (ev->data3 == -1) + if (ev->data3 < 0) { key = key_menu_up; joywait = I_GetTime() + 5; } - else if (ev->data3 == 1) + else if (ev->data3 > 0) { key = key_menu_down; joywait = I_GetTime() + 5; } - if (ev->data2 == -1) + if (ev->data2 < 0) { key = key_menu_left; joywait = I_GetTime() + 2; } - else if (ev->data2 == 1) + else if (ev->data2 > 0) { key = key_menu_right; joywait = I_GetTime() + 2; |