diff --git a/src/g_input.c b/src/g_input.c index 5f3333fa9..0082df273 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -144,6 +144,10 @@ typedef struct UINT8 clicks; } dclick_t; static dclick_t mousedclicks[MOUSEBUTTONS]; +static dclick_t joydclicks[JOYBUTTONS + JOYHATS*4]; +static dclick_t joy2dclicks[JOYBUTTONS + JOYHATS*4]; +static dclick_t joy3dclicks[JOYBUTTONS + JOYHATS*4]; +static dclick_t joy4dclicks[JOYBUTTONS + JOYHATS*4]; // protos static UINT8 G_CheckDoubleClick(UINT8 state, dclick_t *dt); @@ -234,6 +238,30 @@ void G_MapEventsToControls(event_t *ev) flag = G_CheckDoubleClick(gamekeydown[KEY_MOUSE1+i], &mousedclicks[i]); gamekeydown[KEY_DBLMOUSE1+i] = flag; } + + for (i = 0; i < JOYBUTTONS + JOYHATS*4; i++) + { + flag = G_CheckDoubleClick(gamekeydown[KEY_JOY1+i], &joydclicks[i]); + gamekeydown[KEY_DBLJOY1+i] = flag; + } + + for (i = 0; i < JOYBUTTONS + JOYHATS*4; i++) + { + flag = G_CheckDoubleClick(gamekeydown[KEY_2JOY1+i], &joy2dclicks[i]); + gamekeydown[KEY_DBL2JOY1+i] = flag; + } + + for (i = 0; i < JOYBUTTONS + JOYHATS*4; i++) + { + flag = G_CheckDoubleClick(gamekeydown[KEY_3JOY1+i], &joy3dclicks[i]); + gamekeydown[KEY_DBL3JOY1+i] = flag; + } + + for (i = 0; i < JOYBUTTONS + JOYHATS*4; i++) + { + flag = G_CheckDoubleClick(gamekeydown[KEY_4JOY1+i], &joy4dclicks[i]); + gamekeydown[KEY_DBL4JOY1+i] = flag; + } } void G_ResetControls(void) @@ -309,19 +337,19 @@ static keyname_t keynames[] = // keypad keys {KEY_KPADSLASH, "KEYPAD /"}, - {KEY_KEYPAD7, "KEYPAD 7"}, - {KEY_KEYPAD8, "KEYPAD 8"}, - {KEY_KEYPAD9, "KEYPAD 9"}, - {KEY_MINUSPAD, "KEYPAD -"}, - {KEY_KEYPAD4, "KEYPAD 4"}, - {KEY_KEYPAD5, "KEYPAD 5"}, - {KEY_KEYPAD6, "KEYPAD 6"}, - {KEY_PLUSPAD, "KEYPAD +"}, - {KEY_KEYPAD1, "KEYPAD 1"}, - {KEY_KEYPAD2, "KEYPAD 2"}, - {KEY_KEYPAD3, "KEYPAD 3"}, - {KEY_KEYPAD0, "KEYPAD 0"}, - {KEY_KPADDEL, "KEYPAD ."}, + {KEY_KEYPAD7, "KEYPAD 7"}, + {KEY_KEYPAD8, "KEYPAD 8"}, + {KEY_KEYPAD9, "KEYPAD 9"}, + {KEY_MINUSPAD, "KEYPAD -"}, + {KEY_KEYPAD4, "KEYPAD 4"}, + {KEY_KEYPAD5, "KEYPAD 5"}, + {KEY_KEYPAD6, "KEYPAD 6"}, + {KEY_PLUSPAD, "KEYPAD +"}, + {KEY_KEYPAD1, "KEYPAD 1"}, + {KEY_KEYPAD2, "KEYPAD 2"}, + {KEY_KEYPAD3, "KEYPAD 3"}, + {KEY_KEYPAD0, "KEYPAD 0"}, + {KEY_KPADDEL, "KEYPAD ."}, // extended keys (not keypad) {KEY_HOME, "HOME"}, @@ -336,15 +364,15 @@ static keyname_t keynames[] = {KEY_DEL, "DEL"}, // other keys - {KEY_F1, "F1"}, - {KEY_F2, "F2"}, - {KEY_F3, "F3"}, - {KEY_F4, "F4"}, - {KEY_F5, "F5"}, - {KEY_F6, "F6"}, - {KEY_F7, "F7"}, - {KEY_F8, "F8"}, - {KEY_F9, "F9"}, + {KEY_F1, "F1"}, + {KEY_F2, "F2"}, + {KEY_F3, "F3"}, + {KEY_F4, "F4"}, + {KEY_F5, "F5"}, + {KEY_F6, "F6"}, + {KEY_F7, "F7"}, + {KEY_F8, "F8"}, + {KEY_F9, "F9"}, {KEY_F10, "F10"}, {KEY_F11, "F11"}, {KEY_F12, "F12"}, @@ -365,16 +393,6 @@ static keyname_t keynames[] = {KEY_MOUSEWHEELUP, "Wheel 1 UP"}, {KEY_MOUSEWHEELDOWN, "Wheel 1 Down"}, - // mouse double clicks count as a seperate input yes - {KEY_DBLMOUSE1+0, "DBLMOUSE1"}, - {KEY_DBLMOUSE1+1, "DBLMOUSE2"}, - {KEY_DBLMOUSE1+2, "DBLMOUSE3"}, - {KEY_DBLMOUSE1+3, "DBLMOUSE4"}, - {KEY_DBLMOUSE1+4, "DBLMOUSE5"}, - {KEY_DBLMOUSE1+5, "DBLMOUSE6"}, - {KEY_DBLMOUSE1+6, "DBLMOUSE7"}, - {KEY_DBLMOUSE1+7, "DBLMOUSE8"}, - {KEY_JOY1+0, "JOY1"}, {KEY_JOY1+1, "JOY2"}, {KEY_JOY1+2, "JOY3"}, @@ -384,9 +402,10 @@ static keyname_t keynames[] = {KEY_JOY1+6, "JOY7"}, {KEY_JOY1+7, "JOY8"}, {KEY_JOY1+8, "JOY9"}, + #if !defined (NOMOREJOYBTN_1S) // we use up to 32 buttons in DirectInput - {KEY_JOY1+9, "JOY10"}, + {KEY_JOY1+9, "JOY10"}, {KEY_JOY1+10, "JOY11"}, {KEY_JOY1+11, "JOY12"}, {KEY_JOY1+12, "JOY13"}, @@ -411,16 +430,16 @@ static keyname_t keynames[] = {KEY_JOY1+31, "JOY32"}, #endif // the DOS version uses Allegro's joystick support - {KEY_HAT1+0, "HATUP"}, - {KEY_HAT1+1, "HATDOWN"}, - {KEY_HAT1+2, "HATLEFT"}, - {KEY_HAT1+3, "HATRIGHT"}, - {KEY_HAT1+4, "HATUP2"}, - {KEY_HAT1+5, "HATDOWN2"}, - {KEY_HAT1+6, "HATLEFT2"}, - {KEY_HAT1+7, "HATRIGHT2"}, - {KEY_HAT1+8, "HATUP3"}, - {KEY_HAT1+9, "HATDOWN3"}, + {KEY_HAT1+0, "HATUP"}, + {KEY_HAT1+1, "HATDOWN"}, + {KEY_HAT1+2, "HATLEFT"}, + {KEY_HAT1+3, "HATRIGHT"}, + {KEY_HAT1+4, "HATUP2"}, + {KEY_HAT1+5, "HATDOWN2"}, + {KEY_HAT1+6, "HATLEFT2"}, + {KEY_HAT1+7, "HATRIGHT2"}, + {KEY_HAT1+8, "HATUP3"}, + {KEY_HAT1+9, "HATDOWN3"}, {KEY_HAT1+10, "HATLEFT3"}, {KEY_HAT1+11, "HATRIGHT3"}, {KEY_HAT1+12, "HATUP4"}, @@ -428,6 +447,79 @@ static keyname_t keynames[] = {KEY_HAT1+14, "HATLEFT4"}, {KEY_HAT1+15, "HATRIGHT4"}, + {KEY_DBLMOUSE1+0, "DBLMOUSE1"}, + {KEY_DBLMOUSE1+1, "DBLMOUSE2"}, + {KEY_DBLMOUSE1+2, "DBLMOUSE3"}, + {KEY_DBLMOUSE1+3, "DBLMOUSE4"}, + {KEY_DBLMOUSE1+4, "DBLMOUSE5"}, + {KEY_DBLMOUSE1+5, "DBLMOUSE6"}, + {KEY_DBLMOUSE1+6, "DBLMOUSE7"}, + {KEY_DBLMOUSE1+7, "DBLMOUSE8"}, + + {KEY_DBLJOY1+0, "DBLJOY1"}, + {KEY_DBLJOY1+1, "DBLJOY2"}, + {KEY_DBLJOY1+2, "DBLJOY3"}, + {KEY_DBLJOY1+3, "DBLJOY4"}, + {KEY_DBLJOY1+4, "DBLJOY5"}, + {KEY_DBLJOY1+5, "DBLJOY6"}, + {KEY_DBLJOY1+6, "DBLJOY7"}, + {KEY_DBLJOY1+7, "DBLJOY8"}, +#if !defined (NOMOREJOYBTN_1DBL) + {KEY_DBLJOY1+8, "DBLJOY9"}, + {KEY_DBLJOY1+9, "DBLJOY10"}, + {KEY_DBLJOY1+10, "DBLJOY11"}, + {KEY_DBLJOY1+11, "DBLJOY12"}, + {KEY_DBLJOY1+12, "DBLJOY13"}, + {KEY_DBLJOY1+13, "DBLJOY14"}, + {KEY_DBLJOY1+14, "DBLJOY15"}, + {KEY_DBLJOY1+15, "DBLJOY16"}, + {KEY_DBLJOY1+16, "DBLJOY17"}, + {KEY_DBLJOY1+17, "DBLJOY18"}, + {KEY_DBLJOY1+18, "DBLJOY19"}, + {KEY_DBLJOY1+19, "DBLJOY20"}, + {KEY_DBLJOY1+20, "DBLJOY21"}, + {KEY_DBLJOY1+21, "DBLJOY22"}, + {KEY_DBLJOY1+22, "DBLJOY23"}, + {KEY_DBLJOY1+23, "DBLJOY24"}, + {KEY_DBLJOY1+24, "DBLJOY25"}, + {KEY_DBLJOY1+25, "DBLJOY26"}, + {KEY_DBLJOY1+26, "DBLJOY27"}, + {KEY_DBLJOY1+27, "DBLJOY28"}, + {KEY_DBLJOY1+28, "DBLJOY29"}, + {KEY_DBLJOY1+29, "DBLJOY30"}, + {KEY_DBLJOY1+30, "DBLJOY31"}, + {KEY_DBLJOY1+31, "DBLJOY32"}, +#endif + {KEY_DBLHAT1+0, "DBLHATUP"}, + {KEY_DBLHAT1+1, "DBLHATDOWN"}, + {KEY_DBLHAT1+2, "DBLHATLEFT"}, + {KEY_DBLHAT1+3, "DBLHATRIGHT"}, + {KEY_DBLHAT1+4, "DBLHATUP2"}, + {KEY_DBLHAT1+5, "DBLHATDOWN2"}, + {KEY_DBLHAT1+6, "DBLHATLEFT2"}, + {KEY_DBLHAT1+7, "DBLHATRIGHT2"}, + {KEY_DBLHAT1+8, "DBLHATUP3"}, + {KEY_DBLHAT1+9, "DBLHATDOWN3"}, + {KEY_DBLHAT1+10, "DBLHATLEFT3"}, + {KEY_DBLHAT1+11, "DBLHATRIGHT3"}, + {KEY_DBLHAT1+12, "DBLHATUP4"}, + {KEY_DBLHAT1+13, "DBLHATDOWN4"}, + {KEY_DBLHAT1+14, "DBLHATLEFT4"}, + {KEY_DBLHAT1+15, "DBLHATRIGHT4"}, + +#ifdef _PSP + {KEY_2JOY1+0, "SEC_TRIANGLE"}, + {KEY_2JOY1+1, "SEC_CIRCLE" }, + {KEY_2JOY1+2, "SEC_CROSS" }, + {KEY_2JOY1+3, "SEC_SQUARE" }, + {KEY_2JOY1+4, "SEC_LTRIGGER"}, + {KEY_2JOY1+5, "SEC_RTRIGGER"}, + {KEY_2JOY1+6, "SEC_SELECT" }, + {KEY_2JOY1+7, "SEC_START" }, + {KEY_2JOY1+8, "SEC_HOME" }, + {KEY_2JOY1+9, "SEC_HOLD" }, +#define NOMOREJOYBTN_2S +#else {KEY_2JOY1+0, "SEC_JOY1"}, {KEY_2JOY1+1, "SEC_JOY2"}, {KEY_2JOY1+2, "SEC_JOY3"}, @@ -436,10 +528,11 @@ static keyname_t keynames[] = {KEY_2JOY1+5, "SEC_JOY6"}, {KEY_2JOY1+6, "SEC_JOY7"}, {KEY_2JOY1+7, "SEC_JOY8"}, +#endif #if !defined (NOMOREJOYBTN_2S) // we use up to 32 buttons in DirectInput - {KEY_2JOY1+8, "SEC_JOY9"}, - {KEY_2JOY1+9, "SEC_JOY10"}, + {KEY_2JOY1+8, "SEC_JOY9"}, + {KEY_2JOY1+9, "SEC_JOY10"}, {KEY_2JOY1+10, "SEC_JOY11"}, {KEY_2JOY1+11, "SEC_JOY12"}, {KEY_2JOY1+12, "SEC_JOY13"}, @@ -468,12 +561,12 @@ static keyname_t keynames[] = {KEY_2HAT1+1, "SEC_HATDOWN"}, {KEY_2HAT1+2, "SEC_HATLEFT"}, {KEY_2HAT1+3, "SEC_HATRIGHT"}, - {KEY_2HAT1+4, "SEC_HATUP2"}, - {KEY_2HAT1+5, "SEC_HATDOWN2"}, - {KEY_2HAT1+6, "SEC_HATLEFT2"}, - {KEY_2HAT1+7, "SEC_HATRIGHT2"}, - {KEY_2HAT1+8, "SEC_HATUP3"}, - {KEY_2HAT1+9, "SEC_HATDOWN3"}, + {KEY_2HAT1+4, "SEC_HATUP2"}, + {KEY_2HAT1+5, "SEC_HATDOWN2"}, + {KEY_2HAT1+6, "SEC_HATLEFT2"}, + {KEY_2HAT1+7, "SEC_HATRIGHT2"}, + {KEY_2HAT1+8, "SEC_HATUP3"}, + {KEY_2HAT1+9, "SEC_HATDOWN3"}, {KEY_2HAT1+10, "SEC_HATLEFT3"}, {KEY_2HAT1+11, "SEC_HATRIGHT3"}, {KEY_2HAT1+12, "SEC_HATUP4"}, @@ -481,16 +574,82 @@ static keyname_t keynames[] = {KEY_2HAT1+14, "SEC_HATLEFT4"}, {KEY_2HAT1+15, "SEC_HATRIGHT4"}, - {KEY_3JOY1+0, "TRD_JOY1"}, - {KEY_3JOY1+1, "TRD_JOY2"}, - {KEY_3JOY1+2, "TRD_JOY3"}, - {KEY_3JOY1+3, "TRD_JOY4"}, - {KEY_3JOY1+4, "TRD_JOY5"}, - {KEY_3JOY1+5, "TRD_JOY6"}, - {KEY_3JOY1+6, "TRD_JOY7"}, - {KEY_3JOY1+7, "TRD_JOY8"}, - {KEY_3JOY1+8, "TRD_JOY9"}, - {KEY_3JOY1+9, "TRD_JOY10"}, +#ifdef _PSP + {KEY_DBL2JOY1+0, "DBLSEC_TRIANGLE"}, + {KEY_DBL2JOY1+1, "DBLSEC_CIRCLE" }, + {KEY_DBL2JOY1+2, "DBLSEC_CROSS" }, + {KEY_DBL2JOY1+3, "DBLSEC_SQUARE" }, + {KEY_DBL2JOY1+4, "DBLSEC_LTRIGGER"}, + {KEY_DBL2JOY1+5, "DBLSEC_RTRIGGER"}, + {KEY_DBL2JOY1+6, "DBLSEC_SELECT" }, + {KEY_DBL2JOY1+7, "DBLSEC_START" }, + {KEY_DBL2JOY1+8, "DBLSEC_HOME" }, + {KEY_DBL2JOY1+9, "DBLSEC_HOLD" }, +#define NOMOREJOYBTN_2DBL +#else + {KEY_DBL2JOY1+0, "DBLSEC_JOY1"}, + {KEY_DBL2JOY1+1, "DBLSEC_JOY2"}, + {KEY_DBL2JOY1+2, "DBLSEC_JOY3"}, + {KEY_DBL2JOY1+3, "DBLSEC_JOY4"}, + {KEY_DBL2JOY1+4, "DBLSEC_JOY5"}, + {KEY_DBL2JOY1+5, "DBLSEC_JOY6"}, + {KEY_DBL2JOY1+6, "DBLSEC_JOY7"}, + {KEY_DBL2JOY1+7, "DBLSEC_JOY8"}, +#endif +#if !defined (NOMOREJOYBTN_2DBL) + {KEY_DBL2JOY1+8, "DBLSEC_JOY9"}, + {KEY_DBL2JOY1+9, "DBLSEC_JOY10"}, + {KEY_DBL2JOY1+10, "DBLSEC_JOY11"}, + {KEY_DBL2JOY1+11, "DBLSEC_JOY12"}, + {KEY_DBL2JOY1+12, "DBLSEC_JOY13"}, + {KEY_DBL2JOY1+13, "DBLSEC_JOY14"}, + {KEY_DBL2JOY1+14, "DBLSEC_JOY15"}, + {KEY_DBL2JOY1+15, "DBLSEC_JOY16"}, + {KEY_DBL2JOY1+16, "DBLSEC_JOY17"}, + {KEY_DBL2JOY1+17, "DBLSEC_JOY18"}, + {KEY_DBL2JOY1+18, "DBLSEC_JOY19"}, + {KEY_DBL2JOY1+19, "DBLSEC_JOY20"}, + {KEY_DBL2JOY1+20, "DBLSEC_JOY21"}, + {KEY_DBL2JOY1+21, "DBLSEC_JOY22"}, + {KEY_DBL2JOY1+22, "DBLSEC_JOY23"}, + {KEY_DBL2JOY1+23, "DBLSEC_JOY24"}, + {KEY_DBL2JOY1+24, "DBLSEC_JOY25"}, + {KEY_DBL2JOY1+25, "DBLSEC_JOY26"}, + {KEY_DBL2JOY1+26, "DBLSEC_JOY27"}, + {KEY_DBL2JOY1+27, "DBLSEC_JOY28"}, + {KEY_DBL2JOY1+28, "DBLSEC_JOY29"}, + {KEY_DBL2JOY1+29, "DBLSEC_JOY30"}, + {KEY_DBL2JOY1+30, "DBLSEC_JOY31"}, + {KEY_DBL2JOY1+31, "DBLSEC_JOY32"}, +#endif + {KEY_DBL2HAT1+0, "DBLSEC_HATUP"}, + {KEY_DBL2HAT1+1, "DBLSEC_HATDOWN"}, + {KEY_DBL2HAT1+2, "DBLSEC_HATLEFT"}, + {KEY_DBL2HAT1+3, "DBLSEC_HATRIGHT"}, + {KEY_DBL2HAT1+4, "DBLSEC_HATUP2"}, + {KEY_DBL2HAT1+5, "DBLSEC_HATDOWN2"}, + {KEY_DBL2HAT1+6, "DBLSEC_HATLEFT2"}, + {KEY_DBL2HAT1+7, "DBLSEC_HATRIGHT2"}, + {KEY_DBL2HAT1+8, "DBLSEC_HATUP3"}, + {KEY_DBL2HAT1+9, "DBLSEC_HATDOWN3"}, + {KEY_DBL2HAT1+10, "DBLSEC_HATLEFT3"}, + {KEY_DBL2HAT1+11, "DBLSEC_HATRIGHT3"}, + {KEY_DBL2HAT1+12, "DBLSEC_HATUP4"}, + {KEY_DBL2HAT1+13, "DBLSEC_HATDOWN4"}, + {KEY_DBL2HAT1+14, "DBLSEC_HATLEFT4"}, + {KEY_DBL2HAT1+15, "DBLSEC_HATRIGHT4"}, + + + {KEY_3JOY1+0, "TRD_JOY1"}, + {KEY_3JOY1+1, "TRD_JOY2"}, + {KEY_3JOY1+2, "TRD_JOY3"}, + {KEY_3JOY1+3, "TRD_JOY4"}, + {KEY_3JOY1+4, "TRD_JOY5"}, + {KEY_3JOY1+5, "TRD_JOY6"}, + {KEY_3JOY1+6, "TRD_JOY7"}, + {KEY_3JOY1+7, "TRD_JOY8"}, + {KEY_3JOY1+8, "TRD_JOY9"}, + {KEY_3JOY1+9, "TRD_JOY10"}, {KEY_3JOY1+10, "TRD_JOY11"}, {KEY_3JOY1+11, "TRD_JOY12"}, {KEY_3JOY1+12, "TRD_JOY13"}, @@ -514,16 +673,49 @@ static keyname_t keynames[] = {KEY_3JOY1+30, "TRD_JOY31"}, {KEY_3JOY1+31, "TRD_JOY32"}, + {KEY_DBL3JOY1+0, "DBLTRD_JOY1"}, + {KEY_DBL3JOY1+1, "DBLTRD_JOY2"}, + {KEY_DBL3JOY1+2, "DBLTRD_JOY3"}, + {KEY_DBL3JOY1+3, "DBLTRD_JOY4"}, + {KEY_DBL3JOY1+4, "DBLTRD_JOY5"}, + {KEY_DBL3JOY1+5, "DBLTRD_JOY6"}, + {KEY_DBL3JOY1+6, "DBLTRD_JOY7"}, + {KEY_DBL3JOY1+7, "DBLTRD_JOY8"}, + {KEY_DBL3JOY1+8, "DBLTRD_JOY9"}, + {KEY_DBL3JOY1+9, "DBLTRD_JOY10"}, + {KEY_DBL3JOY1+10, "DBLTRD_JOY11"}, + {KEY_DBL3JOY1+11, "DBLTRD_JOY12"}, + {KEY_DBL3JOY1+12, "DBLTRD_JOY13"}, + {KEY_DBL3JOY1+13, "DBLTRD_JOY14"}, + {KEY_DBL3JOY1+14, "DBLTRD_JOY15"}, + {KEY_DBL3JOY1+15, "DBLTRD_JOY16"}, + {KEY_DBL3JOY1+16, "DBLTRD_JOY17"}, + {KEY_DBL3JOY1+17, "DBLTRD_JOY18"}, + {KEY_DBL3JOY1+18, "DBLTRD_JOY19"}, + {KEY_DBL3JOY1+19, "DBLTRD_JOY20"}, + {KEY_DBL3JOY1+20, "DBLTRD_JOY21"}, + {KEY_DBL3JOY1+21, "DBLTRD_JOY22"}, + {KEY_DBL3JOY1+22, "DBLTRD_JOY23"}, + {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"}, + {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+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"}, @@ -531,16 +723,33 @@ static keyname_t keynames[] = {KEY_3HAT1+14, "TRD_HATLEFT4"}, {KEY_3HAT1+15, "TRD_HATRIGHT4"}, - {KEY_4JOY1+0, "FOR_JOY1"}, - {KEY_4JOY1+1, "FOR_JOY2"}, - {KEY_4JOY1+2, "FOR_JOY3"}, - {KEY_4JOY1+3, "FOR_JOY4"}, - {KEY_4JOY1+4, "FOR_JOY5"}, - {KEY_4JOY1+5, "FOR_JOY6"}, - {KEY_4JOY1+6, "FOR_JOY7"}, - {KEY_4JOY1+7, "FOR_JOY8"}, - {KEY_4JOY1+8, "FOR_JOY9"}, - {KEY_4JOY1+9, "FOR_JOY10"}, + {KEY_DBL3HAT1+0, "DBLTRD_HATUP"}, + {KEY_DBL3HAT1+1, "DBLTRD_HATDOWN"}, + {KEY_DBL3HAT1+2, "DBLTRD_HATLEFT"}, + {KEY_DBL3HAT1+3, "DBLTRD_HATRIGHT"}, + {KEY_DBL3HAT1+4, "DBLTRD_HATUP2"}, + {KEY_DBL3HAT1+5, "DBLTRD_HATDOWN2"}, + {KEY_DBL3HAT1+6, "DBLTRD_HATLEFT2"}, + {KEY_DBL3HAT1+7, "DBLTRD_HATRIGHT2"}, + {KEY_DBL3HAT1+8, "DBLTRD_HATUP3"}, + {KEY_DBL3HAT1+9, "DBLTRD_HATDOWN3"}, + {KEY_DBL3HAT1+10, "DBLTRD_HATLEFT3"}, + {KEY_DBL3HAT1+11, "DBLTRD_HATRIGHT3"}, + {KEY_DBL3HAT1+12, "DBLTRD_HATUP4"}, + {KEY_DBL3HAT1+13, "DBLTRD_HATDOWN4"}, + {KEY_DBL3HAT1+14, "DBLTRD_HATLEFT4"}, + {KEY_DBL3HAT1+15, "DBLTRD_HATRIGHT4"}, + + {KEY_4JOY1+0, "FOR_JOY1"}, + {KEY_4JOY1+1, "FOR_JOY2"}, + {KEY_4JOY1+2, "FOR_JOY3"}, + {KEY_4JOY1+3, "FOR_JOY4"}, + {KEY_4JOY1+4, "FOR_JOY5"}, + {KEY_4JOY1+5, "FOR_JOY6"}, + {KEY_4JOY1+6, "FOR_JOY7"}, + {KEY_4JOY1+7, "FOR_JOY8"}, + {KEY_4JOY1+8, "FOR_JOY9"}, + {KEY_4JOY1+9, "FOR_JOY10"}, {KEY_4JOY1+10, "FOR_JOY11"}, {KEY_4JOY1+11, "FOR_JOY12"}, {KEY_4JOY1+12, "FOR_JOY13"}, @@ -564,22 +773,72 @@ static keyname_t keynames[] = {KEY_4JOY1+30, "FOR_JOY31"}, {KEY_4JOY1+31, "FOR_JOY32"}, + {KEY_DBL4JOY1+0, "DBLFOR_JOY1"}, + {KEY_DBL4JOY1+1, "DBLFOR_JOY2"}, + {KEY_DBL4JOY1+2, "DBLFOR_JOY3"}, + {KEY_DBL4JOY1+3, "DBLFOR_JOY4"}, + {KEY_DBL4JOY1+4, "DBLFOR_JOY5"}, + {KEY_DBL4JOY1+5, "DBLFOR_JOY6"}, + {KEY_DBL4JOY1+6, "DBLFOR_JOY7"}, + {KEY_DBL4JOY1+7, "DBLFOR_JOY8"}, + {KEY_DBL4JOY1+8, "DBLFOR_JOY9"}, + {KEY_DBL4JOY1+9, "DBLFOR_JOY10"}, + {KEY_DBL4JOY1+10, "DBLFOR_JOY11"}, + {KEY_DBL4JOY1+11, "DBLFOR_JOY12"}, + {KEY_DBL4JOY1+12, "DBLFOR_JOY13"}, + {KEY_DBL4JOY1+13, "DBLFOR_JOY14"}, + {KEY_DBL4JOY1+14, "DBLFOR_JOY15"}, + {KEY_DBL4JOY1+15, "DBLFOR_JOY16"}, + {KEY_DBL4JOY1+16, "DBLFOR_JOY17"}, + {KEY_DBL4JOY1+17, "DBLFOR_JOY18"}, + {KEY_DBL4JOY1+18, "DBLFOR_JOY19"}, + {KEY_DBL4JOY1+19, "DBLFOR_JOY20"}, + {KEY_DBL4JOY1+20, "DBLFOR_JOY21"}, + {KEY_DBL4JOY1+21, "DBLFOR_JOY22"}, + {KEY_DBL4JOY1+22, "DBLFOR_JOY23"}, + {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"}, + {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+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"}, + {KEY_DBL4HAT1+4, "DBLFOR_HATUP2"}, + {KEY_DBL4HAT1+5, "DBLFOR_HATDOWN2"}, + {KEY_DBL4HAT1+6, "DBLFOR_HATLEFT2"}, + {KEY_DBL4HAT1+7, "DBLFOR_HATRIGHT2"}, + {KEY_DBL4HAT1+8, "DBLFOR_HATUP3"}, + {KEY_DBL4HAT1+9, "DBLFOR_HATDOWN3"}, + {KEY_DBL4HAT1+10, "DBLFOR_HATLEFT3"}, + {KEY_DBL4HAT1+11, "DBLFOR_HATRIGHT3"}, + {KEY_DBL4HAT1+12, "DBLFOR_HATUP4"}, + {KEY_DBL4HAT1+13, "DBLFOR_HATDOWN4"}, + {KEY_DBL4HAT1+14, "DBLFOR_HATLEFT4"}, + {KEY_DBL4HAT1+15, "DBLFOR_HATRIGHT4"}, }; static const char *gamecontrolname[num_gamecontrols] = diff --git a/src/m_menu.c b/src/m_menu.c index 210d6c32f..55cc0f3f9 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9515,6 +9515,14 @@ static void M_ChangecontrolResponse(event_t *ev) // replace mouse and joy clicks by double clicks if (ch >= KEY_MOUSE1 && ch <= KEY_MOUSE1+MOUSEBUTTONS) setupcontrols[control][found] = ch-KEY_MOUSE1+KEY_DBLMOUSE1; + else if (ch >= KEY_JOY1 && ch <= KEY_JOY1+JOYBUTTONS) + setupcontrols[control][found] = ch-KEY_JOY1+KEY_DBLJOY1; + else if (ch >= KEY_2JOY1 && ch <= KEY_2JOY1+JOYBUTTONS) + setupcontrols[control][found] = ch-KEY_2JOY1+KEY_DBL2JOY1; + else if (ch >= KEY_3JOY1 && ch <= KEY_3JOY1+JOYBUTTONS) + setupcontrols[control][found] = ch-KEY_3JOY1+KEY_DBL3JOY1; + else if (ch >= KEY_4JOY1 && ch <= KEY_4JOY1+JOYBUTTONS) + setupcontrols[control][found] = ch-KEY_4JOY1+KEY_DBL4JOY1; } else {