From 64739a3707b1bcb3d3e34a43ce1a682b1f0a4087 Mon Sep 17 00:00:00 2001 From: Rob Pearce Date: Wed, 12 Nov 2008 05:52:21 +0000 Subject: [PATCH] joy fixing --- rc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rc.c b/rc.c index 452b5e8..15cd28b 100644 --- a/rc.c +++ b/rc.c @@ -8567,7 +8567,6 @@ void handleinput(void) { getinput(); - /* ************************************************************ These keys can always be pressed ************************************************************/ @@ -8953,7 +8952,11 @@ void trytoshoot(sprite_t *pl) { } int keydown(int whichplayer, int checkfor) { - // adjust checkfor bsaed on player + int checkkey; + + checkkey = checkfor; + + // adjust checkkey based on player if (whichplayer == 1) { if (checkfor == SDLK_RIGHT) checkfor = SDLK_l; if (checkfor == SDLK_LEFT) checkfor = SDLK_j; @@ -8962,10 +8965,9 @@ int keydown(int whichplayer, int checkfor) { if (checkfor == SDLK_z) checkfor = SDLK_s; if (checkfor == SDLK_x) checkfor = SDLK_d; if (checkfor == SDLK_c) checkfor = SDLK_f; - } // check for keypress - if (keys[checkfor]) { + if (keys[checkkey]) { return B_TRUE; } @@ -10321,6 +10323,7 @@ void drawhiscores(void) { void getinput(void) { int i,j; keys = SDL_GetKeyState(NULL); + if (havejoysticks) { for (j = 0; j < 2; j++) { joyx[j] = SDL_JoystickGetAxis(joy[j],0);