vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed joysticks 3 & 4 

fun typos
This commit is contained in:
TehRealSalt 2017-12-24 15:02:41 -05:00
parent 9c7aad2929
commit 189d2f7a34
5 changed files with 69 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/g_game.c
View File

@ -450,11 +450,7 @@ consvar_t cv_fireaxis2 = {"joyaxis2_fire", "LAnalog", CV_SAVE, joyaxis_cons_t, N
consvar_t cv_firenaxis2 = {"joyaxis2_firenormal", "RAnalog", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#else
consvar_t cv_turnaxis2 = {"joyaxis2_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_turnaxis3 = {"joyaxis3_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_turnaxis4 = {"joyaxis4_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis2 = {"joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis3 = {"joyaxis3_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis4 = {"joyaxis4_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#ifdef _arch_dreamcast
consvar_t cv_sideaxis2 = {"joyaxis2_side", "Triggers", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#elif defined (_XBOX)
@ -464,22 +460,28 @@ consvar_t cv_lookaxis2 = {"joyaxis2_look", "Alt Y-Axis", CV_SAVE, joyaxis_cons_t
consvar_t cv_sideaxis2 = {"joyaxis2_side", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#else
consvar_t cv_sideaxis2 = {"joyaxis2_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sideaxis3 = {"joyaxis3_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sideaxis4 = {"joyaxis4_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#endif
#ifndef _XBOX
consvar_t cv_lookaxis2 = {"joyaxis2_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_lookaxis3 = {"joyaxis3_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_lookaxis4 = {"joyaxis4_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#endif
consvar_t cv_fireaxis2 = {"joyaxis2_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fireaxis3 = {"joyaxis3_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fireaxis4 = {"joyaxis4_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis2 = {"joyaxis2_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis3 = {"joyaxis3_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis4 = {"joyaxis4_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#endif
consvar_t cv_turnaxis3 = {"joyaxis3_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis3 = {"joyaxis3_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sideaxis3 = {"joyaxis3_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_lookaxis3 = {"joyaxis3_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fireaxis3 = {"joyaxis3_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis3 = {"joyaxis3_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_turnaxis4 = {"joyaxis4_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_moveaxis4 = {"joyaxis4_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_sideaxis4 = {"joyaxis4_side", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_lookaxis4 = {"joyaxis4_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fireaxis4 = {"joyaxis4_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis4 = {"joyaxis4_firenormal", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
#if MAXPLAYERS > 16
#error "please update player_name table using the new value for MAXPLAYERS"
@ -1079,7 +1081,7 @@ static INT32 Joy4Axis(axis_input_e axissel)
#ifdef _arch_dreamcast
if (axisval == 7) // special case
{
retaxis = joy2xmove[1] - joy2ymove[1];
retaxis = joy4xmove[1] - joy4ymove[1];
goto skipDC;
}
else
@ -1633,7 +1635,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
keyboard_look = kbl;
turnheld = th;
}
//Reset away view if a command is given.
if ((cmd->forwardmove || cmd->sidemove || cmd->buttons)
&& displayplayer != consoleplayer && ssplayer == 1)

485
src/g_input.c
View File

@ -982,98 +982,7 @@ static keyname_t keynames[] =
#endif
#endif
#ifdef DC
{KEY_3JOY1+0, "TRD_JOYC"},
{KEY_3JOY1+1, "TRD_JOYB"},
{KEY_3JOY1+2, "TRD_JOYA"},
{KEY_3JOY1+3, "TRD_JOYS"},
{KEY_3JOY1+4, "TRD_JOYZ"},
{KEY_3JOY1+5, "TRD_JOYY"},
{KEY_3JOY1+6, "TRD_JOYX"},
{KEY_3JOY1+7, "TRD_JOYD"},
#elif defined (_XBOX)
{KEY_3JOY1+0, "TRD_JOYA"},
{KEY_3JOY1+1, "TRD_JOYB"},
{KEY_3JOY1+2, "TRD_JOYX"},
{KEY_3JOY1+3, "TRD_JOYY"},
{KEY_3JOY1+4, "TRD_JOYG"},
{KEY_3JOY1+5, "TRD_JOYW"},
{KEY_3JOY1+6, "TRD_JOYL"},
{KEY_3JOY1+7, "TRD_JOYR"},
{KEY_3JOY1+8, "TRD_JOYS"},
{KEY_3JOY1+9, "TRD_JOYN"},
{KEY_3JOY1+10,"TRD_JOYW"},
{KEY_3JOY1+11,"TRD_JOYE"},
#define NOMOREJOYBTN_2S
#elif defined (_PSP)
{KEY_3JOY1+0, "TRD_TRIANGLE"},
{KEY_3JOY1+1, "TRD_CIRCLE" },
{KEY_3JOY1+2, "TRD_CROSS" },
{KEY_3JOY1+3, "TRD_SQUARE" },
{KEY_3JOY1+4, "TRD_LTRIGGER"},
{KEY_3JOY1+5, "TRD_RTRIGGER"},
{KEY_3JOY1+6, "TRD_SELECT" },
{KEY_3JOY1+7, "TRD_START" },
{KEY_3JOY1+8, "TRD_HOME" },
{KEY_3JOY1+9, "TRD_HOLD" },
#define NOMOREJOYBTN_2S
#elif defined (WMINPUT)
{KEY_3JOY1+0, "TRD_JOYB"},
{KEY_3JOY1+1, "TRD_JOYA"},
{KEY_3JOY1+2, "TRD_JOYUP"},
{KEY_3JOY1+3, "TRD_JOYDOWN"},
{KEY_3JOY1+4, "TRD_JOYLEFT"},
{KEY_3JOY1+5, "TRD_JOYRIGHT"},
{KEY_3JOY1+6, "TRD_JOYAA"},
{KEY_3JOY1+7, "TRD_JOYBB"},
{KEY_3JOY1+8, "TRD_JOYCC"},
{KEY_3JOY1+9, "TRD_JOYXX"},
{KEY_3JOY1+10, "TRD_JOYYY"},
{KEY_3JOY1+11, "TRD_JOYZZ"},
{KEY_3JOY1+12, "TRD_JOYL"},
{KEY_3JOY1+13, "TRD_JOYR"},
{KEY_3JOY1+14, "TRD_JOYZL"},
{KEY_3JOY1+15, "TRD_JOYZR"},
{KEY_3JOY1+16, "TRD_JOYSELECT"},
{KEY_3JOY1+17, "TRD_JOYSTART"},
{KEY_3JOY1+18, "TRD_JOYHOME"},
{KEY_3JOY1+19, "TRD_JOYMINUS"},
{KEY_3JOY1+20, "TRD_JOYPLUS"},
{KEY_3JOY1+21, "TRD_JOY_1"},
{KEY_3JOY1+22, "TRD_JOY_2"},
{KEY_3JOY1+23, "TRD_JOY24"},
{KEY_3JOY1+24, "TRD_JOY25"},
{KEY_3JOY1+25, "TRD_JOY26"},
{KEY_3JOY1+26, "TRD_JOY27"},
{KEY_3JOY1+27, "TRD_JOY28"},
{KEY_3JOY1+28, "TRD_JOY29"},
{KEY_3JOY1+29, "TRD_JOY30"},
{KEY_3JOY1+30, "TRD_JOY31"},
{KEY_3JOY1+31, "TRD_JOY32"},
#define NOMOREJOYBTN_2S
#elif defined (_WII)
{KEY_3JOY1+0, "TRD_JOYA"},
{KEY_3JOY1+1, "TRD_JOYB"},
{KEY_3JOY1+2, "TRD_JOY1"},
{KEY_3JOY1+3, "TRD_JOY2"},
{KEY_3JOY1+4, "TRD_JOYMINUS"},
{KEY_3JOY1+5, "TRD_JOYPLUS"},
{KEY_3JOY1+6, "TRD_JOYHOME"},
{KEY_3JOY1+7, "TRD_JOYZ"},
{KEY_3JOY1+8, "TRD_JOYC"},
{KEY_3JOY1+9, "TRD_JOYA_CC"},
{KEY_3JOY1+10, "TRD_JOYB_CC"},
{KEY_3JOY1+11, "TRD_JOYX"},
{KEY_3JOY1+12, "TRD_JOYY"},
{KEY_3JOY1+13, "TRD_JOYL"},
{KEY_3JOY1+14, "TRD_JOYR"},
{KEY_3JOY1+15, "TRD_JOYZL"},
{KEY_3JOY1+16, "TRD_JOYZR"},
{KEY_3JOY1+17, "TRD_JOYMINUS_CC"},
{KEY_3JOY1+18, "TRD_JOYHPLUS_CC"},
{KEY_3JOY1+19, "TRD_JOYMHOME_CC"},
#define NOMOREJOYBTN_2S
#else
{KEY_3JOY1+0, "TRD_JOY1"},
{KEY_3JOY1+1, "TRD_JOY2"},
{KEY_3JOY1+2, "TRD_JOY3"},
@ -1082,9 +991,6 @@ static keyname_t keynames[] =
{KEY_3JOY1+5, "TRD_JOY6"},
{KEY_3JOY1+6, "TRD_JOY7"},
{KEY_3JOY1+7, "TRD_JOY8"},
#endif
#if !defined (_arch_dreamcast) && !defined (NOMOREJOYBTN_2S)
// we use up to 32 buttons in DirectInput
{KEY_3JOY1+8, "TRD_JOY9"},
{KEY_3JOY1+9, "TRD_JOY10"},
{KEY_3JOY1+10, "TRD_JOY11"},
@ -1109,121 +1015,7 @@ static keyname_t keynames[] =
{KEY_3JOY1+29, "TRD_JOY30"},
{KEY_3JOY1+30, "TRD_JOY31"},
{KEY_3JOY1+31, "TRD_JOY32"},
#endif
// the DOS version uses Allegro's joystick support
{KEY_3HAT1+0, "TRD_HATUP"},
{KEY_3HAT1+1, "TRD_HATDOWN"},
{KEY_3HAT1+2, "TRD_HATLEFT"},
{KEY_3HAT1+3, "TRD_HATRIGHT"},
#if !defined (_XBOX) && !defined (_PSP) && !defined (_WII)
{KEY_3HAT1+4, "TRD_HATUP2"},
{KEY_3HAT1+5, "TRD_HATDOWN2"},
{KEY_3HAT1+6, "TRD_HATLEFT2"},
{KEY_3HAT1+7, "TRD_HATRIGHT2"},
#ifndef _arch_dreamcast
{KEY_3HAT1+8, "TRD_HATUP3"},
{KEY_3HAT1+9, "TRD_HATDOWN3"},
{KEY_3HAT1+10, "TRD_HATLEFT3"},
{KEY_3HAT1+11, "TRD_HATRIGHT3"},
{KEY_3HAT1+12, "TRD_HATUP4"},
{KEY_3HAT1+13, "TRD_HATDOWN4"},
{KEY_3HAT1+14, "TRD_HATLEFT4"},
{KEY_3HAT1+15, "TRD_HATRIGHT4"},
#endif
#endif
#ifdef DC
{KEY_DBL3JOY1+0, "DBLTRD_JOYC"},
{KEY_DBL3JOY1+1, "DBLTRD_JOYB"},
{KEY_DBL3JOY1+2, "DBLTRD_JOYA"},
{KEY_DBL3JOY1+3, "DBLTRD_JOYS"},
{KEY_DBL3JOY1+4, "DBLTRD_JOYZ"},
{KEY_DBL3JOY1+5, "DBLTRD_JOYY"},
{KEY_DBL3JOY1+6, "DBLTRD_JOYX"},
{KEY_DBL3JOY1+7, "DBLTRD_JOYD"},
#elif defined (_XBOX)
{KEY_DBL3JOY1+0, "DBLTRD_JOYA"},
{KEY_DBL3JOY1+1, "DBLTRD_JOYB"},
{KEY_DBL3JOY1+2, "DBLTRD_JOYX"},
{KEY_DBL3JOY1+3, "DBLTRD_JOYY"},
{KEY_DBL3JOY1+4, "DBLTRD_JOYG"},
{KEY_DBL3JOY1+5, "DBLTRD_JOYW"},
{KEY_DBL3JOY1+6, "DBLTRD_JOYL"},
{KEY_DBL3JOY1+7, "DBLTRD_JOYR"},
{KEY_DBL3JOY1+8, "DBLTRD_JOYS"},
{KEY_DBL3JOY1+9, "DBLTRD_JOYN"},
{KEY_DBL3JOY1+10,"DBLTRD_JOYW"},
{KEY_DBL3JOY1+11,"DBLTRD_JOYE"},
#define NOMOREJOYBTN_2DBL
#elif defined (_PSP)
{KEY_DBL3JOY1+0, "DBLTRD_TRIANGLE"},
{KEY_DBL3JOY1+1, "DBLTRD_CIRCLE" },
{KEY_DBL3JOY1+2, "DBLTRD_CROSS" },
{KEY_DBL3JOY1+3, "DBLTRD_SQUARE" },
{KEY_DBL3JOY1+4, "DBLTRD_LTRIGGER"},
{KEY_DBL3JOY1+5, "DBLTRD_RTRIGGER"},
{KEY_DBL3JOY1+6, "DBLTRD_SELECT" },
{KEY_DBL3JOY1+7, "DBLTRD_START" },
{KEY_DBL3JOY1+8, "DBLTRD_HOME" },
{KEY_DBL3JOY1+9, "DBLTRD_HOLD" },
#define NOMOREJOYBTN_2DBL
#elif defined (WMINPUT)
{KEY_DBL3JOY1+0, "DBLTRD_JOYB"},
{KEY_DBL3JOY1+1, "DBLTRD_JOYA"},
{KEY_DBL3JOY1+2, "DBLTRD_JOYUP"},
{KEY_DBL3JOY1+3, "DBLTRD_JOYDOWN"},
{KEY_DBL3JOY1+4, "DBLTRD_JOYLEFT"},
{KEY_DBL3JOY1+5, "DBLTRD_JOYRIGHT"},
{KEY_DBL3JOY1+6, "DBLTRD_JOYAA"},
{KEY_DBL3JOY1+7, "DBLTRD_JOYBB"},
{KEY_DBL3JOY1+8, "DBLTRD_JOYCC"},
{KEY_DBL3JOY1+9, "DBLTRD_JOYXX"},
{KEY_DBL3JOY1+10, "DBLTRD_JOYYY"},
{KEY_DBL3JOY1+11, "DBLTRD_JOYZZ"},
{KEY_DBL3JOY1+12, "DBLTRD_JOYL"},
{KEY_DBL3JOY1+13, "DBLTRD_JOYR"},
{KEY_DBL3JOY1+14, "DBLTRD_JOYZL"},
{KEY_DBL3JOY1+15, "DBLTRD_JOYZR"},
{KEY_DBL3JOY1+16, "DBLTRD_JOYSELECT"},
{KEY_DBL3JOY1+17, "DBLTRD_JOYSTART"},
{KEY_DBL3JOY1+18, "DBLTRD_JOYHOME"},
{KEY_DBL3JOY1+19, "DBLTRD_JOYMINUS"},
{KEY_DBL3JOY1+20, "DBLTRD_JOYPLUS"},
{KEY_DBL3JOY1+21, "DBLTRD_JOY_1"},
{KEY_DBL3JOY1+22, "DBLTRD_JOY_2"},
{KEY_DBL3JOY1+23, "DBLTRD_JOY24"},
{KEY_DBL3JOY1+24, "DBLTRD_JOY25"},
{KEY_DBL3JOY1+25, "DBLTRD_JOY26"},
{KEY_DBL3JOY1+26, "DBLTRD_JOY27"},
{KEY_DBL3JOY1+27, "DBLTRD_JOY28"},
{KEY_DBL3JOY1+28, "DBLTRD_JOY29"},
{KEY_DBL3JOY1+29, "DBLTRD_JOY30"},
{KEY_DBL3JOY1+30, "DBLTRD_JOY31"},
{KEY_DBL3JOY1+31, "DBLTRD_JOY32"},
#define NOMOREJOYBTN_2SDBL
#elif defined (_WII)
{KEY_DBL3JOY1+0, "DBLTRD_JOYA"},
{KEY_DBL3JOY1+1, "DBLTRD_JOYB"},
{KEY_DBL3JOY1+2, "DBLTRD_JOY1"},
{KEY_DBL3JOY1+3, "DBLTRD_JOY2"},
{KEY_DBL3JOY1+4, "DBLTRD_JOYMINUS"},
{KEY_DBL3JOY1+5, "DBLTRD_JOYPLUS"},
{KEY_DBL3JOY1+6, "DBLTRD_JOYHOME"},
{KEY_DBL3JOY1+7, "DBLTRD_JOYZ"},
{KEY_DBL3JOY1+8, "DBLTRD_JOYC"},
{KEY_DBL3JOY1+9, "DBLTRD_JOYA_CC"},
{KEY_DBL3JOY1+10, "DBLTRD_JOYB_CC"},
{KEY_DBL3JOY1+11, "DBLTRD_JOYX"},
{KEY_DBL3JOY1+12, "DBLTRD_JOYY"},
{KEY_DBL3JOY1+13, "DBLTRD_JOYL"},
{KEY_DBL3JOY1+14, "DBLTRD_JOYR"},
{KEY_DBL3JOY1+15, "DBLTRD_JOYZL"},
{KEY_DBL3JOY1+16, "DBLTRD_JOYZR"},
{KEY_DBL3JOY1+17, "DBLTRD_JOYMINUS_CC"},
{KEY_DBL3JOY1+18, "DBLTRD_JOYHPLUS_CC"},
{KEY_DBL3JOY1+19, "DBLTRD_JOYMHOME_CC"},
#define NOMOREJOYBTN_2DBL
#else
{KEY_DBL3JOY1+0, "DBLTRD_JOY1"},
{KEY_DBL3JOY1+1, "DBLTRD_JOY2"},
{KEY_DBL3JOY1+2, "DBLTRD_JOY3"},
@ -1232,8 +1024,6 @@ static keyname_t keynames[] =
{KEY_DBL3JOY1+5, "DBLTRD_JOY6"},
{KEY_DBL3JOY1+6, "DBLTRD_JOY7"},
{KEY_DBL3JOY1+7, "DBLTRD_JOY8"},
#endif
#if !defined (_arch_dreamcast) && !defined (NOMOREJOYBTN_2DBL)
{KEY_DBL3JOY1+8, "DBLTRD_JOY9"},
{KEY_DBL3JOY1+9, "DBLTRD_JOY10"},
{KEY_DBL3JOY1+10, "DBLTRD_JOY11"},
@ -1258,17 +1048,32 @@ static keyname_t keynames[] =
{KEY_DBL3JOY1+29, "DBLTRD_JOY30"},
{KEY_DBL3JOY1+30, "DBLTRD_JOY31"},
{KEY_DBL3JOY1+31, "DBLTRD_JOY32"},
#endif
{KEY_3HAT1+0, "TRD_HATUP"},
{KEY_3HAT1+1, "TRD_HATDOWN"},
{KEY_3HAT1+2, "TRD_HATLEFT"},
{KEY_3HAT1+3, "TRD_HATRIGHT"},
{KEY_3HAT1+4, "TRD_HATUP2"},
{KEY_3HAT1+5, "TRD_HATDOWN2"},
{KEY_3HAT1+6, "TRD_HATLEFT2"},
{KEY_3HAT1+7, "TRD_HATRIGHT2"},
{KEY_3HAT1+8, "TRD_HATUP3"},
{KEY_3HAT1+9, "TRD_HATDOWN3"},
{KEY_3HAT1+10, "TRD_HATLEFT3"},
{KEY_3HAT1+11, "TRD_HATRIGHT3"},
{KEY_3HAT1+12, "TRD_HATUP4"},
{KEY_3HAT1+13, "TRD_HATDOWN4"},
{KEY_3HAT1+14, "TRD_HATLEFT4"},
{KEY_3HAT1+15, "TRD_HATRIGHT4"},
{KEY_DBL3HAT1+0, "DBLTRD_HATUP"},
{KEY_DBL3HAT1+1, "DBLTRD_HATDOWN"},
{KEY_DBL3HAT1+2, "DBLTRD_HATLEFT"},
{KEY_DBL3HAT1+3, "DBLTRD_HATRIGHT"},
#if !defined (_XBOX) && !defined (_PSP) && !defined (_WII)
{KEY_DBL3HAT1+4, "DBLTRD_HATUP2"},
{KEY_DBL3HAT1+5, "DBLTRD_HATDOWN2"},
{KEY_DBL3HAT1+6, "DBLTRD_HATLEFT2"},
{KEY_DBL3HAT1+7, "DBLTRD_HATRIGHT2"},
#ifndef _arch_dreamcast
{KEY_DBL3HAT1+8, "DBLTRD_HATUP3"},
{KEY_DBL3HAT1+9, "DBLTRD_HATDOWN3"},
{KEY_DBL3HAT1+10, "DBLTRD_HATLEFT3"},
@ -1277,101 +1082,7 @@ static keyname_t keynames[] =
{KEY_DBL3HAT1+13, "DBLTRD_HATDOWN4"},
{KEY_DBL3HAT1+14, "DBLTRD_HATLEFT4"},
{KEY_DBL3HAT1+15, "DBLTRD_HATRIGHT4"},
#endif
#endif
#ifdef DC
{KEY_4JOY1+0, "FOR_JOYC"},
{KEY_4JOY1+1, "FOR_JOYB"},
{KEY_4JOY1+2, "FOR_JOYA"},
{KEY_4JOY1+3, "FOR_JOYS"},
{KEY_4JOY1+4, "FOR_JOYZ"},
{KEY_4JOY1+5, "FOR_JOYY"},
{KEY_4JOY1+6, "FOR_JOYX"},
{KEY_4JOY1+7, "FOR_JOYD"},
#elif defined (_XBOX)
{KEY_4JOY1+0, "FOR_JOYA"},
{KEY_4JOY1+1, "FOR_JOYB"},
{KEY_4JOY1+2, "FOR_JOYX"},
{KEY_4JOY1+3, "FOR_JOYY"},
{KEY_4JOY1+4, "FOR_JOYG"},
{KEY_4JOY1+5, "FOR_JOYW"},
{KEY_4JOY1+6, "FOR_JOYL"},
{KEY_4JOY1+7, "FOR_JOYR"},
{KEY_4JOY1+8, "FOR_JOYS"},
{KEY_4JOY1+9, "FOR_JOYN"},
{KEY_4JOY1+10,"FOR_JOYW"},
{KEY_4JOY1+11,"FOR_JOYE"},
#define NOMOREJOYBTN_2S
#elif defined (_PSP)
{KEY_4JOY1+0, "FOR_TRIANGLE"},
{KEY_4JOY1+1, "FOR_CIRCLE" },
{KEY_4JOY1+2, "FOR_CROSS" },
{KEY_4JOY1+3, "FOR_SQUARE" },
{KEY_4JOY1+4, "FOR_LTRIGGER"},
{KEY_4JOY1+5, "FOR_RTRIGGER"},
{KEY_4JOY1+6, "FOR_SELECT" },
{KEY_4JOY1+7, "FOR_START" },
{KEY_4JOY1+8, "FOR_HOME" },
{KEY_4JOY1+9, "FOR_HOLD" },
#define NOMOREJOYBTN_2S
#elif defined (WMINPUT)
{KEY_4JOY1+0, "FOR_JOYB"},
{KEY_4JOY1+1, "FOR_JOYA"},
{KEY_4JOY1+2, "FOR_JOYUP"},
{KEY_4JOY1+3, "FOR_JOYDOWN"},
{KEY_4JOY1+4, "FOR_JOYLEFT"},
{KEY_4JOY1+5, "FOR_JOYRIGHT"},
{KEY_4JOY1+6, "FOR_JOYAA"},
{KEY_4JOY1+7, "FOR_JOYBB"},
{KEY_4JOY1+8, "FOR_JOYCC"},
{KEY_4JOY1+9, "FOR_JOYXX"},
{KEY_4JOY1+10, "FOR_JOYYY"},
{KEY_4JOY1+11, "FOR_JOYZZ"},
{KEY_4JOY1+12, "FOR_JOYL"},
{KEY_4JOY1+13, "FOR_JOYR"},
{KEY_4JOY1+14, "FOR_JOYZL"},
{KEY_4JOY1+15, "FOR_JOYZR"},
{KEY_4JOY1+16, "FOR_JOYSELECT"},
{KEY_4JOY1+17, "FOR_JOYSTART"},
{KEY_4JOY1+18, "FOR_JOYHOME"},
{KEY_4JOY1+19, "FOR_JOYMINUS"},
{KEY_4JOY1+20, "FOR_JOYPLUS"},
{KEY_4JOY1+21, "FOR_JOY_1"},
{KEY_4JOY1+22, "FOR_JOY_2"},
{KEY_4JOY1+23, "FOR_JOY24"},
{KEY_4JOY1+24, "FOR_JOY25"},
{KEY_4JOY1+25, "FOR_JOY26"},
{KEY_4JOY1+26, "FOR_JOY27"},
{KEY_4JOY1+27, "FOR_JOY28"},
{KEY_4JOY1+28, "FOR_JOY29"},
{KEY_4JOY1+29, "FOR_JOY30"},
{KEY_4JOY1+30, "FOR_JOY31"},
{KEY_4JOY1+31, "FOR_JOY32"},
#define NOMOREJOYBTN_2S
#elif defined (_WII)
{KEY_4JOY1+0, "FOR_JOYA"},
{KEY_4JOY1+1, "FOR_JOYB"},
{KEY_4JOY1+2, "FOR_JOY1"},
{KEY_4JOY1+3, "FOR_JOY2"},
{KEY_4JOY1+4, "FOR_JOYMINUS"},
{KEY_4JOY1+5, "FOR_JOYPLUS"},
{KEY_4JOY1+6, "FOR_JOYHOME"},
{KEY_4JOY1+7, "FOR_JOYZ"},
{KEY_4JOY1+8, "FOR_JOYC"},
{KEY_4JOY1+9, "FOR_JOYA_CC"},
{KEY_4JOY1+10, "FOR_JOYB_CC"},
{KEY_4JOY1+11, "FOR_JOYX"},
{KEY_4JOY1+12, "FOR_JOYY"},
{KEY_4JOY1+13, "FOR_JOYL"},
{KEY_4JOY1+14, "FOR_JOYR"},
{KEY_4JOY1+15, "FOR_JOYZL"},
{KEY_4JOY1+16, "FOR_JOYZR"},
{KEY_4JOY1+17, "FOR_JOYMINUS_CC"},
{KEY_4JOY1+18, "FOR_JOYHPLUS_CC"},
{KEY_4JOY1+19, "FOR_JOYMHOME_CC"},
#define NOMOREJOYBTN_2S
#else
{KEY_4JOY1+0, "FOR_JOY1"},
{KEY_4JOY1+1, "FOR_JOY2"},
{KEY_4JOY1+2, "FOR_JOY3"},
@ -1380,9 +1091,6 @@ static keyname_t keynames[] =
{KEY_4JOY1+5, "FOR_JOY6"},
{KEY_4JOY1+6, "FOR_JOY7"},
{KEY_4JOY1+7, "FOR_JOY8"},
#endif
#if !defined (_arch_dreamcast) && !defined (NOMOREJOYBTN_2S)
// we use up to 32 buttons in DirectInput
{KEY_4JOY1+8, "FOR_JOY9"},
{KEY_4JOY1+9, "FOR_JOY10"},
{KEY_4JOY1+10, "FOR_JOY11"},
@ -1407,121 +1115,7 @@ static keyname_t keynames[] =
{KEY_4JOY1+29, "FOR_JOY30"},
{KEY_4JOY1+30, "FOR_JOY31"},
{KEY_4JOY1+31, "FOR_JOY32"},
#endif
// the DOS version uses Allegro's joystick support
{KEY_4HAT1+0, "FOR_HATUP"},
{KEY_4HAT1+1, "FOR_HATDOWN"},
{KEY_4HAT1+2, "FOR_HATLEFT"},
{KEY_4HAT1+3, "FOR_HATRIGHT"},
#if !defined (_XBOX) && !defined (_PSP) && !defined (_WII)
{KEY_4HAT1+4, "FOR_HATUP2"},
{KEY_4HAT1+5, "FOR_HATDOWN2"},
{KEY_4HAT1+6, "FOR_HATLEFT2"},
{KEY_4HAT1+7, "FOR_HATRIGHT2"},
#ifndef _arch_dreamcast
{KEY_4HAT1+8, "FOR_HATUP3"},
{KEY_4HAT1+9, "FOR_HATDOWN3"},
{KEY_4HAT1+10, "FOR_HATLEFT3"},
{KEY_4HAT1+11, "FOR_HATRIGHT3"},
{KEY_4HAT1+12, "FOR_HATUP4"},
{KEY_4HAT1+13, "FOR_HATDOWN4"},
{KEY_4HAT1+14, "FOR_HATLEFT4"},
{KEY_4HAT1+15, "FOR_HATRIGHT4"},
#endif
#endif
#ifdef DC
{KEY_DBL4JOY1+0, "DBLFOR_JOYC"},
{KEY_DBL4JOY1+1, "DBLFOR_JOYB"},
{KEY_DBL4JOY1+2, "DBLFOR_JOYA"},
{KEY_DBL4JOY1+3, "DBLFOR_JOYS"},
{KEY_DBL4JOY1+4, "DBLFOR_JOYZ"},
{KEY_DBL4JOY1+5, "DBLFOR_JOYY"},
{KEY_DBL4JOY1+6, "DBLFOR_JOYX"},
{KEY_DBL4JOY1+7, "DBLFOR_JOYD"},
#elif defined (_XBOX)
{KEY_DBL4JOY1+0, "DBLFOR_JOYA"},
{KEY_DBL4JOY1+1, "DBLFOR_JOYB"},
{KEY_DBL4JOY1+2, "DBLFOR_JOYX"},
{KEY_DBL4JOY1+3, "DBLFOR_JOYY"},
{KEY_DBL4JOY1+4, "DBLFOR_JOYG"},
{KEY_DBL4JOY1+5, "DBLFOR_JOYW"},
{KEY_DBL4JOY1+6, "DBLFOR_JOYL"},
{KEY_DBL4JOY1+7, "DBLFOR_JOYR"},
{KEY_DBL4JOY1+8, "DBLFOR_JOYS"},
{KEY_DBL4JOY1+9, "DBLFOR_JOYN"},
{KEY_DBL4JOY1+10,"DBLFOR_JOYW"},
{KEY_DBL4JOY1+11,"DBLFOR_JOYE"},
#define NOMOREJOYBTN_2DBL
#elif defined (_PSP)
{KEY_DBL4JOY1+0, "DBLFOR_TRIANGLE"},
{KEY_DBL4JOY1+1, "DBLFOR_CIRCLE" },
{KEY_DBL4JOY1+2, "DBLFOR_CROSS" },
{KEY_DBL4JOY1+3, "DBLFOR_SQUARE" },
{KEY_DBL4JOY1+4, "DBLFOR_LTRIGGER"},
{KEY_DBL4JOY1+5, "DBLFOR_RTRIGGER"},
{KEY_DBL4JOY1+6, "DBLFOR_SELECT" },
{KEY_DBL4JOY1+7, "DBLFOR_START" },
{KEY_DBL4JOY1+8, "DBLFOR_HOME" },
{KEY_DBL4JOY1+9, "DBLFOR_HOLD" },
#define NOMOREJOYBTN_2DBL
#elif defined (WMINPUT)
{KEY_DBL4JOY1+0, "DBLFOR_JOYB"},
{KEY_DBL4JOY1+1, "DBLFOR_JOYA"},
{KEY_DBL4JOY1+2, "DBLFOR_JOYUP"},
{KEY_DBL4JOY1+3, "DBLFOR_JOYDOWN"},
{KEY_DBL4JOY1+4, "DBLFOR_JOYLEFT"},
{KEY_DBL4JOY1+5, "DBLFOR_JOYRIGHT"},
{KEY_DBL4JOY1+6, "DBLFOR_JOYAA"},
{KEY_DBL4JOY1+7, "DBLFOR_JOYBB"},
{KEY_DBL4JOY1+8, "DBLFOR_JOYCC"},
{KEY_DBL4JOY1+9, "DBLFOR_JOYXX"},
{KEY_DBL4JOY1+10, "DBLFOR_JOYYY"},
{KEY_DBL4JOY1+11, "DBLFOR_JOYZZ"},
{KEY_DBL4JOY1+12, "DBLFOR_JOYL"},
{KEY_DBL4JOY1+13, "DBLFOR_JOYR"},
{KEY_DBL4JOY1+14, "DBLFOR_JOYZL"},
{KEY_DBL4JOY1+15, "DBLFOR_JOYZR"},
{KEY_DBL4JOY1+16, "DBLFOR_JOYSELECT"},
{KEY_DBL4JOY1+17, "DBLFOR_JOYSTART"},
{KEY_DBL4JOY1+18, "DBLFOR_JOYHOME"},
{KEY_DBL4JOY1+19, "DBLFOR_JOYMINUS"},
{KEY_DBL4JOY1+20, "DBLFOR_JOYPLUS"},
{KEY_DBL4JOY1+21, "DBLFOR_JOY_1"},
{KEY_DBL4JOY1+22, "DBLFOR_JOY_2"},
{KEY_DBL4JOY1+23, "DBLFOR_JOY24"},
{KEY_DBL4JOY1+24, "DBLFOR_JOY25"},
{KEY_DBL4JOY1+25, "DBLFOR_JOY26"},
{KEY_DBL4JOY1+26, "DBLFOR_JOY27"},
{KEY_DBL4JOY1+27, "DBLFOR_JOY28"},
{KEY_DBL4JOY1+28, "DBLFOR_JOY29"},
{KEY_DBL4JOY1+29, "DBLFOR_JOY30"},
{KEY_DBL4JOY1+30, "DBLFOR_JOY31"},
{KEY_DBL4JOY1+31, "DBLFOR_JOY32"},
#define NOMOREJOYBTN_2SDBL
#elif defined (_WII)
{KEY_DBL4JOY1+0, "DBLFOR_JOYA"},
{KEY_DBL4JOY1+1, "DBLFOR_JOYB"},
{KEY_DBL4JOY1+2, "DBLFOR_JOY1"},
{KEY_DBL4JOY1+3, "DBLFOR_JOY2"},
{KEY_DBL4JOY1+4, "DBLFOR_JOYMINUS"},
{KEY_DBL4JOY1+5, "DBLFOR_JOYPLUS"},
{KEY_DBL4JOY1+6, "DBLFOR_JOYHOME"},
{KEY_DBL4JOY1+7, "DBLFOR_JOYZ"},
{KEY_DBL4JOY1+8, "DBLFOR_JOYC"},
{KEY_DBL4JOY1+9, "DBLFOR_JOYA_CC"},
{KEY_DBL4JOY1+10, "DBLFOR_JOYB_CC"},
{KEY_DBL4JOY1+11, "DBLFOR_JOYX"},
{KEY_DBL4JOY1+12, "DBLFOR_JOYY"},
{KEY_DBL4JOY1+13, "DBLFOR_JOYL"},
{KEY_DBL4JOY1+14, "DBLFOR_JOYR"},
{KEY_DBL4JOY1+15, "DBLFOR_JOYZL"},
{KEY_DBL4JOY1+16, "DBLFOR_JOYZR"},
{KEY_DBL4JOY1+17, "DBLFOR_JOYMINUS_CC"},
{KEY_DBL4JOY1+18, "DBLFOR_JOYHPLUS_CC"},
{KEY_DBL4JOY1+19, "DBLFOR_JOYMHOME_CC"},
#define NOMOREJOYBTN_2DBL
#else
{KEY_DBL4JOY1+0, "DBLFOR_JOY1"},
{KEY_DBL4JOY1+1, "DBLFOR_JOY2"},
{KEY_DBL4JOY1+2, "DBLFOR_JOY3"},
@ -1530,8 +1124,6 @@ static keyname_t keynames[] =
{KEY_DBL4JOY1+5, "DBLFOR_JOY6"},
{KEY_DBL4JOY1+6, "DBLFOR_JOY7"},
{KEY_DBL4JOY1+7, "DBLFOR_JOY8"},
#endif
#if !defined (_arch_dreamcast) && !defined (NOMOREJOYBTN_2DBL)
{KEY_DBL4JOY1+8, "DBLFOR_JOY9"},
{KEY_DBL4JOY1+9, "DBLFOR_JOY10"},
{KEY_DBL4JOY1+10, "DBLFOR_JOY11"},
@ -1556,17 +1148,32 @@ static keyname_t keynames[] =
{KEY_DBL4JOY1+29, "DBLFOR_JOY30"},
{KEY_DBL4JOY1+30, "DBLFOR_JOY31"},
{KEY_DBL4JOY1+31, "DBLFOR_JOY32"},
#endif
{KEY_4HAT1+0, "FOR_HATUP"},
{KEY_4HAT1+1, "FOR_HATDOWN"},
{KEY_4HAT1+2, "FOR_HATLEFT"},
{KEY_4HAT1+3, "FOR_HATRIGHT"},
{KEY_4HAT1+4, "FOR_HATUP2"},
{KEY_4HAT1+5, "FOR_HATDOWN2"},
{KEY_4HAT1+6, "FOR_HATLEFT2"},
{KEY_4HAT1+7, "FOR_HATRIGHT2"},
{KEY_4HAT1+8, "FOR_HATUP3"},
{KEY_4HAT1+9, "FOR_HATDOWN3"},
{KEY_4HAT1+10, "FOR_HATLEFT3"},
{KEY_4HAT1+11, "FOR_HATRIGHT3"},
{KEY_4HAT1+12, "FOR_HATUP4"},
{KEY_4HAT1+13, "FOR_HATDOWN4"},
{KEY_4HAT1+14, "FOR_HATLEFT4"},
{KEY_4HAT1+15, "FOR_HATRIGHT4"},
{KEY_DBL4HAT1+0, "DBLFOR_HATUP"},
{KEY_DBL4HAT1+1, "DBLFOR_HATDOWN"},
{KEY_DBL4HAT1+2, "DBLFOR_HATLEFT"},
{KEY_DBL4HAT1+3, "DBLFOR_HATRIGHT"},
#if !defined (_XBOX) && !defined (_PSP) && !defined (_WII)
{KEY_DBL4HAT1+4, "DBLFOR_HATUP2"},
{KEY_DBL4HAT1+5, "DBLFOR_HATDOWN2"},
{KEY_DBL4HAT1+6, "DBLFOR_HATLEFT2"},
{KEY_DBL4HAT1+7, "DBLFOR_HATRIGHT2"},
#ifndef _arch_dreamcast
{KEY_DBL4HAT1+8, "DBLFOR_HATUP3"},
{KEY_DBL4HAT1+9, "DBLFOR_HATDOWN3"},
{KEY_DBL4HAT1+10, "DBLFOR_HATLEFT3"},
@ -1575,8 +1182,6 @@ static keyname_t keynames[] =
{KEY_DBL4HAT1+13, "DBLFOR_HATDOWN4"},
{KEY_DBL4HAT1+14, "DBLFOR_HATLEFT4"},
{KEY_DBL4HAT1+15, "DBLFOR_HATRIGHT4"},
#endif
#endif
};
@ -1589,8 +1194,8 @@ static const char *gamecontrolname[num_gamecontrols] =
"straferight",
"turnleft",
"turnright",
"weaponnext",
"weaponprev",
"driftleft",
"driftright",
"weapon1",
"weapon2",
"weapon3",
@ -1602,13 +1207,13 @@ static const char *gamecontrolname[num_gamecontrols] =
"weapon9",
"weapon10",
"fire",
"firenormal",
"tossflag",
"use",
"accelerate",
"spectate",
"brake",
"camtoggle",
"camleft",
"camright",
"camreset",
"aimforward",
"aimbackward",
"lookback",
"lookup",
"lookdown",
"centerview",

2
src/g_input.h
View File

@ -144,7 +144,7 @@ extern INT32 mlooky; //mousey with mlookSensitivity
extern INT32 mouse2x, mouse2y, mlook2y;
extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET],
joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET];
joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET];
// current state of the keys: true if pushed
extern UINT8 gamekeydown[NUMINPUTS];

6
src/k_kart.c
View File

@ -4811,19 +4811,19 @@ static void K_drawKartBalloonsOrKarma(void)
if (stplyr->kartstuff[k_balloon] <= 0)
{
V_DrawMappedPatch(LAPS_X, LAPS_Y, splitflags, kp_karmasticker, colormap);
V_DrawKartString(LAPS_X+58, LAPS_Y+3, splitflags, va("%d/3", stplyr->kartstuff[k_comebackpoints]));
V_DrawKartString(LAPS_X+57, LAPS_Y+3, splitflags, va("%d/3", stplyr->kartstuff[k_comebackpoints]));
}
else
{
if (stplyr->kartstuff[k_balloon] > 9 || cv_kartballoons.value > 9)
{
V_DrawMappedPatch(LAPS_X, LAPS_Y, splitflags, kp_balloonstickerwide, colormap);
V_DrawKartString(LAPS_X+46, LAPS_Y+3, splitflags, va("%d/%2d", stplyr->kartstuff[k_balloon], cv_kartballoons.value));
V_DrawKartString(LAPS_X+45, LAPS_Y+3, splitflags, va("%d/%2d", stplyr->kartstuff[k_balloon], cv_kartballoons.value));
}
else
{
V_DrawMappedPatch(LAPS_X, LAPS_Y, splitflags, kp_balloonsticker, colormap);
V_DrawKartString(LAPS_X+46, LAPS_Y+3, splitflags, va("%d/%d", stplyr->kartstuff[k_balloon], cv_kartballoons.value));
V_DrawKartString(LAPS_X+45, LAPS_Y+3, splitflags, va("%d/%d", stplyr->kartstuff[k_balloon], cv_kartballoons.value));
}
}
}

8
src/sdl/i_system.c
View File

@ -1752,7 +1752,7 @@ static void I_ShutdownJoystick4(void)
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
if (cv_usejoystick4.value == 0)
{
DEBFILE("I_Joystick3: SDL's Joystick system has been shutdown\n");
DEBFILE("I_Joystick4: SDL's Joystick system has been shutdown\n");
}
}
}
@ -1949,13 +1949,13 @@ static int joy_open4(const char *fname)
if (!JoyInfo4.dev)
{
CONS_Printf(M_GetText("Couldn't open joystick4: %s\n"), SDL_GetError());
I_ShutdownJoystick3();
I_ShutdownJoystick4();
return -1;
}
else
{
CONS_Printf(M_GetText("Joystick4: %s\n"), SDL_JoystickName(JoyInfo4.dev));
JoyInfo3.axises = SDL_JoystickNumAxes(JoyInfo4.dev);
JoyInfo4.axises = SDL_JoystickNumAxes(JoyInfo4.dev);
if (JoyInfo4.axises > JOYAXISSET*2)
JoyInfo4.axises = JOYAXISSET*2;
/* if (joyaxes < 2)
@ -1975,7 +1975,7 @@ static int joy_open4(const char *fname)
JoyInfo4.balls = SDL_JoystickNumBalls(JoyInfo4.dev);
//Joystick.bGamepadStyle = !stricmp(SDL_JoystickName(JoyInfo4.dev), "pad");
//Joystick4.bGamepadStyle = !stricmp(SDL_JoystickName(JoyInfo4.dev), "pad");
return JoyInfo4.axises;
}