commit 0c74071858b7dc8df708519b1efffbf18d6ad954
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Sep 28 17:02:31 2008 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Sep 28 17:02:31 2008 +0000
Make the joybspeed autorun hack work in Heretic.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1303
---
src/heretic/g_game.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
index 53f57026..364d25ea 100644
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@ -161,6 +161,8 @@ int mousex, mousey; // mouse values are used once
int dclicktime, dclickstate, dclicks;
int dclicktime2, dclickstate2, dclicks2;
+#define MAX_JOY_BUTTONS 20
+
int joyxmove, joyymove; // joystick values are repeated
boolean joyarray[5];
boolean *joybuttons = &joyarray[1]; // allow [-1]
@@ -238,8 +240,9 @@ void G_BuildTiccmd(ticcmd_t * cmd)
strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe]
|| joybuttons[joybstrafe];
- speed = gamekeydown[key_speed] || joybuttons[joybspeed]
- || joybuttons[joybspeed];
+ speed = joybspeed >= MAX_JOY_BUTTONS
+ || gamekeydown[key_speed]
+ || joybuttons[joybspeed];
#ifdef __WATCOMC__
if (useexterndriver)
{