zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Wii: Bump MAXJOYAXES to 9 to avoid menu corruption, and fix _functio.h, CONFIG_FunctionNameToNum, CONFIG_AnalogNameToNum, so that this does not crash.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4827 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-12-18 18:16:16 +00:00
parent eca33954db
commit 989f182eb4
5 changed files with 30 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/build/src/sdlayer.c
View file

@ -681,9 +681,10 @@ int32_t initinput(void)
SDL_JoystickEventState(SDL_ENABLE); SDL_JoystickEventState(SDL_ENABLE);
inputdevices |= 4; inputdevices |= 4;
joynumaxes = SDL_JoystickNumAxes(joydev); // KEEPINSYNC source/gamedefs.h, source/jmact/_control.h
joynumaxes = min(9, SDL_JoystickNumAxes(joydev));
joynumbuttons = min(32, SDL_JoystickNumButtons(joydev)); joynumbuttons = min(32, SDL_JoystickNumButtons(joydev));
joynumhats = SDL_JoystickNumHats(joydev); joynumhats = min((36-joynumbuttons)/4,SDL_JoystickNumHats(joydev));
initprintf("Joystick 1 has %d axes, %d buttons, and %d hat(s).\n", joynumaxes, joynumbuttons, joynumhats); initprintf("Joystick 1 has %d axes, %d buttons, and %d hat(s).\n", joynumaxes, joynumbuttons, joynumhats);
joyaxis = (int32_t *)Bcalloc(joynumaxes, sizeof(int32_t)); joyaxis = (int32_t *)Bcalloc(joynumaxes, sizeof(int32_t));

158
polymer/eduke32/source/_functio.h
View file

@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// default button assignments and game function names // default button assignments and game function names
// axis defaults are also included // axis defaults are also included
#include "_control.h"
#include "control.h"
#ifndef function_private_h_ #ifndef function_private_h_
#define function_private_h_ #define function_private_h_
@ -218,7 +220,7 @@ const char oldkeydefaults[NUMGAMEFUNCTIONS*3][MAXGAMEFUNCLEN] =
"Dpad_Aiming", "", "", "Dpad_Aiming", "", "",
}; };
static const char * mousedefaults[] = static const char * mousedefaults[MAXMOUSEBUTTONS] =
{ {
"Fire", "Fire",
"MedKit", "MedKit",
@ -226,45 +228,27 @@ static const char * mousedefaults[] =
"", "",
"Previous_Weapon", "Previous_Weapon",
"Next_Weapon", "Next_Weapon",
"",
"",
"",
""
}; };
static const char * mouseclickeddefaults[] = static const char * mouseclickeddefaults[MAXMOUSEBUTTONS] =
{ {
"",
"",
"",
"",
"",
"",
"",
"",
"",
""
}; };
static const char * mouseanalogdefaults[] = static const char * mouseanalogdefaults[MAXMOUSEAXES] =
{ {
"analog_turning", "analog_turning",
"analog_moving", "analog_moving",
}; };
static const char * mousedigitaldefaults[] = static const char * mousedigitaldefaults[MAXMOUSEDIGITAL] =
{ {
"",
"",
"",
"",
}; };
#if defined(GEKKO) #if defined(GEKKO)
static const char * joystickdefaults[] = static const char * joystickdefaults[MAXJOYBUTTONSANDHATS] =
{ {
"Open", // A "Open", // A
"Fire", // B "Fire", // B
@ -285,27 +269,10 @@ static const char * joystickdefaults[] =
"Inventory_Right", // D-Pad Right "Inventory_Right", // D-Pad Right
"Inventory", // D-Pad Down "Inventory", // D-Pad Down
"Inventory_Left", // D-Pad Left "Inventory_Left", // D-Pad Left
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
}; };
static const char * joystickclickeddefaults[] = static const char * joystickclickeddefaults[MAXJOYBUTTONSANDHATS] =
{ {
"", "",
"", "",
@ -320,74 +287,23 @@ static const char * joystickclickeddefaults[] =
"", "",
"", "",
"Inventory", "Inventory",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
}; };
static const char * joystickanalogdefaults[] = static const char * joystickanalogdefaults[MAXJOYAXES] =
{ {
"analog_strafing", "analog_strafing",
"analog_moving", "analog_moving",
"analog_turning", "analog_turning",
"analog_lookingupanddown", "analog_lookingupanddown",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
}; };
static const char * joystickdigitaldefaults[] = static const char * joystickdigitaldefaults[MAXJOYDIGITAL] =
{ {
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
}; };
#else #else
static const char * joystickdefaults[] = static const char * joystickdefaults[MAXJOYBUTTONSANDHATS] =
{ {
"Fire", "Fire",
"Strafe", "Strafe",
@ -428,61 +344,24 @@ static const char * joystickdefaults[] =
}; };
static const char * joystickclickeddefaults[] = static const char * joystickclickeddefaults[MAXJOYBUTTONSANDHATS] =
{ {
"", "",
"Inventory", "Inventory",
"Jump", "Jump",
"Crouch", "Crouch",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
}; };
static const char * joystickanalogdefaults[] = static const char * joystickanalogdefaults[MAXJOYAXES] =
{ {
"analog_turning", "analog_turning",
"analog_moving", "analog_moving",
"analog_strafing", "analog_strafing",
"",
"",
"",
"",
"",
}; };
static const char * joystickdigitaldefaults[] = static const char * joystickdigitaldefaults[MAXJOYDIGITAL] =
{ {
"", "",
"", "",
@ -491,15 +370,6 @@ static const char * joystickdigitaldefaults[] =
"", "",
"", "",
"Run", "Run",
"",
"",
"",
"",
"",
"",
"",
"",
"",
}; };
#endif #endif

5
polymer/eduke32/source/config.c
View file

@ -64,6 +64,9 @@ int32_t CONFIG_FunctionNameToNum(const char *func)
{ {
int32_t i; int32_t i;
if (!func)
return -1;
i = hash_find(&h_gamefuncs,func); i = hash_find(&h_gamefuncs,func);
if (i < 0) if (i < 0)
@ -104,6 +107,8 @@ char *CONFIG_FunctionNumToName(int32_t func)
int32_t CONFIG_AnalogNameToNum(const char *func) int32_t CONFIG_AnalogNameToNum(const char *func)
{ {
if (!func)
return -1;
if (!Bstrcasecmp(func,"analog_turning")) if (!Bstrcasecmp(func,"analog_turning"))
{ {

8
polymer/eduke32/source/gamedefs.h
View file

@ -46,18 +46,18 @@ extern "C" {
#define SETUPFILENAME "eduke32.cfg" #define SETUPFILENAME "eduke32.cfg"
// Number of JOY buttons // Number of JOY buttons
// KEEPINSYNC jmact/_control.h // KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c
#define MAXJOYBUTTONS 32 #define MAXJOYBUTTONS 32
#define MAXJOYBUTTONSANDHATS (MAXJOYBUTTONS+4) #define MAXJOYBUTTONSANDHATS (MAXJOYBUTTONS+4)
// Number of Mouse Axes // Number of Mouse Axes
// KEEPINSYNC jmact/_control.h // KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c
#define MAXMOUSEAXES 2 #define MAXMOUSEAXES 2
#define MAXMOUSEDIGITAL (MAXMOUSEAXES*2) #define MAXMOUSEDIGITAL (MAXMOUSEAXES*2)
// Number of JOY axes // Number of JOY axes
// KEEPINSYNC jmact/_control.h // KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c
#define MAXJOYAXES 8 #define MAXJOYAXES 9
#define MAXJOYDIGITAL (MAXJOYAXES*2) #define MAXJOYDIGITAL (MAXJOYAXES*2)
// DEFAULT mouse sensitivity scale // DEFAULT mouse sensitivity scale

8
polymer/eduke32/source/jmact/_control.h
View file

@ -64,18 +64,18 @@ extern "C" {
//#define MAXMOUSEBUTTONS 10 //#define MAXMOUSEBUTTONS 10
// Number of Mouse Axes // Number of Mouse Axes
// KEEPINSYNC gamedefs.h // KEEPINSYNC source/gamedefs.h, build/src/sdlayer.c
#define MAXMOUSEAXES 2 #define MAXMOUSEAXES 2
#define MAXMOUSEDIGITAL (MAXMOUSEAXES*2) #define MAXMOUSEDIGITAL (MAXMOUSEAXES*2)
// Number of JOY buttons // Number of JOY buttons
// KEEPINSYNC gamedefs.h // KEEPINSYNC source/gamedefs.h, build/src/sdlayer.c
#define MAXJOYBUTTONS 32 #define MAXJOYBUTTONS 32
#define MAXJOYBUTTONSANDHATS (MAXJOYBUTTONS+4) #define MAXJOYBUTTONSANDHATS (MAXJOYBUTTONS+4)
// Number of JOY axes // Number of JOY axes
// KEEPINSYNC gamedefs.h // KEEPINSYNC source/gamedefs.h, build/src/sdlayer.c
#define MAXJOYAXES 8 #define MAXJOYAXES 9
#define MAXJOYDIGITAL (MAXJOYAXES*2) #define MAXJOYDIGITAL (MAXJOYAXES*2)
// NORMAL axis scale // NORMAL axis scale