diff --git a/src/d_main.c b/src/d_main.c index 6bd8b13f1..fd92739b9 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -166,48 +166,56 @@ UINT8 ctrldown = 0; // 0x1 left, 0x2 right UINT8 altdown = 0; // 0x1 left, 0x2 right boolean capslock = 0; // gee i wonder what this does. -static void D_PadMenuScrollInput(int input) +static void D_PadMenuScrollInput(UINT8 input) { - event_t myev = {0, 0, 0, 0}; - myev.type = ev_keydown; - myev.data1 = input; - D_PostEvent(&myev); // put into eventlist + event_t dpadev; + memset(&dpadev, 0, sizeof(event_t)); + dpadev.type = ev_keydown; + + switch (input) + { + case DPAD_UP: + dpadev.data1 = KEY_UPARROW; + break; + case DPAD_DOWN: + dpadev.data1 = KEY_DOWNARROW; + break; + case DPAD_LEFT: + dpadev.data1 = KEY_LEFTARROW; + break; + case DPAD_RIGHT: + dpadev.data1 = KEY_RIGHTARROW; + break; + } + + D_PostEvent(&dpadev); // put into eventlist } -#define SCROLLDELAY 19 // TICRATE * ( (k+2) (1 - [wz + h + j - q]^2 - [(gk + 2g + k + 1)(h + j) + h - z]^2 - [16(k + 1)^3(k + 2)(n + 1)^2 + 1 - f^2]^2 calculated by my butt +#define SCROLLDELAY 19 -// this is absolutely awful and i hate it lmao -// but le hAx0r to make dpad also be able to scroll in the menu +// Check if any dpad button is held +// and pass it to the eventlist static void D_GamePadMenuScrollTicker(void) { - static SINT8 menuInputDelayTimer = 0; - int key = 0; // butt-on output + static UINT8 menuInputDelayTimer = 0; if (dedicated) return; - // wish i had a switch ono - if (DPADUPSCROLL) - key = KEY_UPARROW; - else if (DPADDOWNSCROLL) - key = KEY_DOWNARROW; - else if (DPADLEFTSCROLL) - key = KEY_LEFTARROW; - else if (DPADRIGHTSCROLL) - key = KEY_RIGHTARROW; - - if (key) + for (UINT8 i = 0; i < 4; i++) { - if (menuInputDelayTimer < SCROLLDELAY) - menuInputDelayTimer++; + if (dpadscrollstate[i]) + { + if (menuInputDelayTimer < SCROLLDELAY) + menuInputDelayTimer++; + else if (menuInputDelayTimer == SCROLLDELAY) + D_PadMenuScrollInput(i); - if (menuInputDelayTimer == SCROLLDELAY) - D_PadMenuScrollInput(key); - } - else - { - menuInputDelayTimer = 0; + return; + } } + + menuInputDelayTimer = 0; } #undef SCROLLDELAY diff --git a/src/m_menu.c b/src/m_menu.c index 17bbdd65d..a87033997 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3822,10 +3822,7 @@ static void Command_Manual_f(void) itemOn = 0; } -boolean DPADUPSCROLL = false; -boolean DPADDOWNSCROLL = false; -boolean DPADLEFTSCROLL = false; -boolean DPADRIGHTSCROLL = false; +boolean dpadscrollstate[4] = {false, false, false, false}; // // M_Responder @@ -3833,7 +3830,6 @@ boolean DPADRIGHTSCROLL = false; boolean M_Responder(event_t *ev) { INT32 ch = -1; -// INT32 i; static tic_t joywaitx = 0, joywaity = 0, joywaitaccel = 0, mousewait = 0; static INT32 pjoyx = 0, pjoyy = 0, pjoyaccel = 0; static INT32 pmousex = 0, pmousey = 0; @@ -3874,19 +3870,19 @@ boolean M_Responder(event_t *ev) break; case KEY_HAT1: ch = KEY_UPARROW; - DPADUPSCROLL = true; + dpadscrollstate[DPAD_UP] = true; break; case KEY_HAT1 + 1: ch = KEY_DOWNARROW; - DPADDOWNSCROLL = true; + dpadscrollstate[DPAD_DOWN] = true; break; case KEY_HAT1 + 2: ch = KEY_LEFTARROW; - DPADLEFTSCROLL = true; + dpadscrollstate[DPAD_LEFT] = true; break; case KEY_HAT1 + 3: ch = KEY_RIGHTARROW; - DPADRIGHTSCROLL = true; + dpadscrollstate[DPAD_RIGHT] = true; break; } @@ -3907,22 +3903,23 @@ boolean M_Responder(event_t *ev) switch (ev->data1) // if you let go of those set those to false { case KEY_HAT1: - DPADUPSCROLL = false; + dpadscrollstate[DPAD_UP] = false; break; case KEY_HAT1 + 1: - DPADDOWNSCROLL = false; + dpadscrollstate[DPAD_DOWN] = false; break; case KEY_HAT1 + 2: - DPADLEFTSCROLL = false; + dpadscrollstate[DPAD_LEFT] = false; break; case KEY_HAT1 + 3: - DPADRIGHTSCROLL = false; + dpadscrollstate[DPAD_RIGHT] = false; break; } } else if (menuactive) { tic_t thistime = I_GetTime(); + if (ev->type == ev_joystick) { const INT32 jxdeadzone = ((JOYAXISRANGE-1) * max(cv_xdeadzone[0].value, FRACUNIT/2)) >> FRACBITS; @@ -4376,7 +4373,6 @@ boolean M_Responder(event_t *ev) // special responder for demos boolean M_DemoResponder(event_t *ev) { - INT32 ch = -1; // cur event data boolean eatinput = false; // :omnom: @@ -4562,11 +4558,7 @@ void M_StartControlPanel(void) menuactive = true; // reset those just in case the game missed the keyup event - DPADUPSCROLL = false; - DPADDOWNSCROLL = false; - DPADLEFTSCROLL = false; - DPADRIGHTSCROLL = false; - // + memset(dpadscrollstate, false, sizeof(dpadscrollstate)); if (demo.playback) { diff --git a/src/m_menu.h b/src/m_menu.h index 45f0fbbf9..126d59e1b 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -33,6 +33,16 @@ extern boolean forceshowhud; // Does all the real work of the menu interaction. boolean M_Responder(event_t *ev); +// for scrolling through menus with controllers +extern boolean dpadscrollstate[4]; +enum +{ + DPAD_UP, + DPAD_DOWN, + DPAD_LEFT, + DPAD_RIGHT +}; + // Called by main loop, runs for demo playback. If this returns true, nullify any further user input. boolean M_DemoResponder(event_t *ev);