From 4e1ef7c0cddeb9bc5487609d637c38967b0103bb Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Dec 2025 15:11:30 +0100 Subject: [PATCH 01/16] Revert "remove the wonky double tap input for controllers" This reverts commit 9e2fd091a807b41104a0a1c68dd5ed7491f4ade8. causes some wonky issues still, will need to look into it more, but for now revert --- src/g_input.c | 425 ++++++++++++++++++++++++++++++++++++++++---------- src/m_menu.c | 8 + 2 files changed, 350 insertions(+), 83 deletions(-) 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 9fe60d0a4..db5e85799 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9516,6 +9516,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 { From 7013e6314270914e5d3f506a32b53887d98d62fb Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Dec 2025 17:17:58 +0100 Subject: [PATCH 02/16] Menus: dont advertise encore toggle if its not unlocked yet! this wont do anything anyways besides telling you you havent unlocked it yet so can just hide it --- src/m_menu.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index db5e85799..0c1a492eb 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1034,18 +1034,6 @@ boolean M_Responder(event_t *ev) ch = KEY_RIGHTARROW; break; } - - if (menuactive) - { - if (currentMenu == &MISC_ChangeLevelDef || currentMenu == &MP_OfflineServerDef || currentMenu == &MP_ServerDef) - { - if (ch == gamecontrol[0][gc_fire][0] - || ch == gamecontrol[0][gc_fire][1]) - { - COM_ImmedExecute("add kartencore 1"); - } - } - } } else if (menuactive) { @@ -1237,6 +1225,19 @@ boolean M_Responder(event_t *ev) if ((ch == gamecontrol[0][gc_brake][0] || ch == gamecontrol[0][gc_brake][1]) && ch >= KEY_MOUSE1) // do this here, otherwise brake opens the menu mid-game ch = KEY_ESCAPE; + if (currentMenu == &MISC_ChangeLevelDef || + currentMenu == &MP_OfflineServerDef || + currentMenu == &MP_ServerDef) + { + if (ch == gamecontrol[0][gc_fire][0] + || ch == gamecontrol[0][gc_fire][1]) + { + if (M_SecretUnlocked(SECRET_ENCORE)) + COM_ImmedExecute("add kartencore 1"); + return true; + } + } + routine = currentMenu->menuitems[itemOn].itemaction; // Handle menuitems which need a specific key handling @@ -7382,7 +7383,8 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) patch_t *PictureOfLevel; INT32 x, y, w, i, oldval, trans, dupadjust = (vid.scaledwidth - BASEVIDWIDTH)>>1; - if (levellistmode != LLM_RECORDATTACK) // so it doesent show in record attack menu + // so it doesent show in record attack menu + if (levellistmode != LLM_RECORDATTACK && M_SecretUnlocked(SECRET_ENCORE)) // gotta have it unlocked first ofc { char encoretoggle[32] = {0}; const char *item1 = gamecontrol[0][gc_fire][0] != 0 ? G_KeynumToString(gamecontrol[0][gc_fire][0]) : NULL; From ac57b7fd2d1980efc2cac220972fcddc889e1900 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Dec 2025 17:19:07 +0100 Subject: [PATCH 03/16] Menu: show stats for current skin in Time Attack menu + some cleanup --- src/k_hud.c | 2 +- src/k_hud.h | 3 +++ src/m_menu.c | 35 +++++++++++++++++++++++++++-------- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index 12f8fd105..59278a229 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -568,7 +568,7 @@ static patch_t *kp_racefinish[6]; static patch_t *kp_positionnum[NUMPOSNUMS][NUMPOSFRAMES]; static patch_t *kp_winnernum[NUMPOSFRAMES]; -static patch_t *kp_facenum[MAXPLAYERS+1]; +patch_t *kp_facenum[MAXPLAYERS+1]; static patch_t *kp_facehighlight[8]; static patch_t *kp_rankbumper; diff --git a/src/k_hud.h b/src/k_hud.h index 7504f3dc7..c42996a4e 100644 --- a/src/k_hud.h +++ b/src/k_hud.h @@ -41,6 +41,9 @@ extern consvar_t cv_battlespeedo; extern consvar_t cv_multiitemicon; extern consvar_t cv_huditemamount; +// for use in timeattack menu +extern patch_t *kp_facenum[MAXPLAYERS+1]; + #define NUMSPEEDOSTUFF 8 extern CV_PossibleValue_t speedo_cons_t[NUMSPEEDOSTUFF]; #define NUMDGAUGESTUFF 6 diff --git a/src/m_menu.c b/src/m_menu.c index 0c1a492eb..aa84309c3 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6244,11 +6244,27 @@ void M_DrawTimeAttackMenu(void) SHOWMODDEDGAME + const INT32 skinnum = max(cv_chooseskin.value-1, 0); // dont think its needed but better safe than sorry! + const skin_t *skin = &skins[skinnum]; + // Character face! - if (W_CheckNumForName(skins[cv_chooseskin.value-1].facewant) != LUMPERROR) + if (W_CheckNumForName(skin->facewant) != LUMPERROR) { - UINT8 *colormap = R_GetTranslationColormap(cv_chooseskin.value-1, cv_playercolor.value, GTC_MENUCACHE); - V_DrawMappedPatch(BASEVIDWIDTH-x - facewantprefix[cv_chooseskin.value-1]->width, y, 0, facewantprefix[cv_chooseskin.value-1], colormap); + const INT32 charx = (BASEVIDWIDTH-x - facewantprefix[skinnum]->width); + + UINT8 *colormap = NULL; + + colormap = R_GetTranslationColormap(skinnum, cv_playercolor.value, GTC_MENUCACHE); + V_DrawMappedPatch(charx, y, 0, facewantprefix[skinnum], colormap); + + // draw stats + // speed + colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_BLUEBERRY, GTC_CACHE); + V_DrawFixedPatch((charx-6) << FRACBITS, (y-5) << FRACBITS, 3*FRACUNIT/2, 0, kp_facenum[min(9, max(1, skin->kartspeed))], colormap); + // weight + colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_BURGUNDY, GTC_CACHE); + V_DrawFixedPatch((charx+25) << FRACBITS, (y+25) << FRACBITS, 3*FRACUNIT/2, 0, kp_facenum[min(9, max(1, skin->kartweight))], colormap); + // idk if kp_facenum are the best numbers for this case? but works with some scaling lul } for (i = 0; i < currentMenu->numitems; ++i) @@ -6278,7 +6294,7 @@ void M_DrawTimeAttackMenu(void) } else { - const char *str = ((cv == &cv_chooseskin) ? skins[cv_chooseskin.value-1].realname : cv->string); + const char *str = ((cv == &cv_chooseskin) ? skin->realname : cv->string); INT32 soffset = 40, strw = V_StringWidth(str, 0); // hack to keep the menu from overlapping the level icon @@ -6323,10 +6339,12 @@ void M_DrawTimeAttackMenu(void) { tic_t lap = 0, time = 0; - if (mainrecords[cv_nextmap.value-1]) + const recorddata_t *currecord = mainrecords[cv_nextmap.value-1]; + + if (currecord) { - lap = mainrecords[cv_nextmap.value-1]->lap; - time = mainrecords[cv_nextmap.value-1]->time; + lap = currecord->lap; + time = currecord->time; } V_DrawFill((BASEVIDWIDTH - vid.scaledwidth)>>1, 78, vid.scaledwidth, 36, 239); @@ -6348,6 +6366,7 @@ void M_DrawTimeAttackMenu(void) y = currentMenu->y+SP_TimeAttackMenu[i].alphaKey; V_DrawString(x, y, V_TRANSLUCENT|MENUCAPS, SP_TimeAttackMenu[i].text); ncv = (consvar_t *)SP_TimeAttackMenu[i].itemaction; + if (SP_TimeAttackMenu[i].status & IT_CV_STRING) { M_DrawTextBox(x + 32, y - 8, MAXPLAYERNAME, 1); @@ -6355,7 +6374,7 @@ void M_DrawTimeAttackMenu(void) } else { - const char *str = ((ncv == &cv_chooseskin) ? skins[cv_chooseskin.value-1].realname : ncv->string); + const char *str = ((ncv == &cv_chooseskin) ? skin->realname : ncv->string); INT32 soffset = 40, strw = V_StringWidth(str, 0); // hack to keep the menu from overlapping the level icon From 0321b0d94a878cc544ef818970ab506ad20e7b60 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Dec 2025 17:28:53 +0100 Subject: [PATCH 04/16] m_menu: do some cleanup - replay drawers --- src/m_menu.c | 292 ++++++++++++++++++++++++++------------------------- 1 file changed, 149 insertions(+), 143 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index aa84309c3..1ce5dda09 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3393,8 +3393,6 @@ static void M_DrawTemperature(INT32 x, fixed_t t) // bounds check if (t > FRACUNIT) t = FRACUNIT; - /*else if (t < 0) -- not needed - t = 0;*/ // scale if (t > 1) @@ -4242,6 +4240,7 @@ void M_ReplayHut(INT32 choice) } else if (!demo.inreplayhut) dir_on[menudepthleft] = 0; + demo.inreplayhut = true; replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1; @@ -4434,136 +4433,140 @@ static void DrawReplayHutReplayInfo(void) UINT8 *colormap; INT32 x, y, w, h; - switch (demolist[dir_on[menudepthleft]].type) + const menudemo_t *replaydemolist = &demolist[dir_on[menudepthleft]]; + + switch (replaydemolist->type) { - case MD_NOTLOADED: - V_DrawCenteredString(160, 40, V_SNAPTOTOP|MENUCAPS, "Loading replay information..."); - break; - - case MD_INVALID: - V_DrawCenteredString(160, 40, V_SNAPTOTOP|warningflags|MENUCAPS, "This replay cannot be played."); - break; - - case MD_SUBDIR: - break; // Can't think of anything to draw here right now - - case MD_OUTDATED: - V_DrawThinString(17, 64, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT|highlightflags, va("Recorded on an outdated version. %s", demolist[dir_on[menudepthleft]].version)); - /* FALLTHRU */ - default: - // Draw level stuff - x = 15; y = 15; - - // A 160x100 image of the level as entry MAPxxP - //CONS_Printf("%d %s\n", demolist[dir_on[menudepthleft]].map, G_BuildMapName(demolist[dir_on[menudepthleft]].map)); - lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(demolist[dir_on[menudepthleft]].map))); - if (lumpnum != LUMPERROR) - patch = (patch_t *)W_CachePatchNum(lumpnum, PU_PATCH); - else - patch = (patch_t *)W_CachePatchName("M_NOLVL", PU_PATCH); - - if (!(demolist[dir_on[menudepthleft]].kartspeed & DF_ENCORE)) - V_DrawSmallScaledPatch(x, y, V_SNAPTOTOP, patch); - else - { - w = patch->width; - h = patch->height; - V_DrawSmallScaledPatch(x+(w>>1), y, V_SNAPTOTOP|V_FLIP, patch); - - { - static angle_t rubyfloattime = 0; - const fixed_t rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT); - V_DrawFixedPatch((x+(w>>2))<>2))<version)); + /* FALLTHRU */ + default: + // Draw level stuff + x = 15; y = 15; - // Character face! - if (demolist[dir_on[menudepthleft]].standings[0].skin < numskins && W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[0].skin].facewant) != LUMPERROR) - { - patch = facewantprefix[demolist[dir_on[menudepthleft]].standings[0].skin]; - colormap = R_GetTranslationColormap( - demolist[dir_on[menudepthleft]].standings[0].skin, - demolist[dir_on[menudepthleft]].standings[0].color, - GTC_MENUCACHE); - } - else - { - patch = (patch_t *)W_CachePatchName("M_NOWANT", PU_PATCH); - colormap = R_GetTranslationColormap( - TC_RAINBOW, - demolist[dir_on[menudepthleft]].standings[0].color, - GTC_MENUCACHE); - } + // A 160x100 image of the level as entry MAPxxP + //CONS_Printf("%d %s\n", replaydemolist->map, G_BuildMapName(replaydemolist->map)); + lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(replaydemolist->map))); + if (lumpnum != LUMPERROR) + patch = (patch_t *)W_CachePatchNum(lumpnum, PU_PATCH); + else + patch = (patch_t *)W_CachePatchName("M_NOLVL", PU_PATCH); - V_DrawMappedPatch(BASEVIDWIDTH-15 - patch->width, y+20, V_SNAPTOTOP, patch, colormap); + if (!(replaydemolist->kartspeed & DF_ENCORE)) + V_DrawSmallScaledPatch(x, y, V_SNAPTOTOP, patch); + else + { + w = patch->width; + h = patch->height; + V_DrawSmallScaledPatch(x+(w>>1), y, V_SNAPTOTOP|V_FLIP, patch); - break; + { + static angle_t rubyfloattime = 0; + const fixed_t rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT); + V_DrawFixedPatch((x+(w>>2))<>2))<map-1]) + { + char *title = G_BuildMapTitle(replaydemolist->map); + if (title) + { + V_DrawString(x, y, V_SNAPTOTOP|MENUCAPS, title); + Z_Free(title); + } + } + else + V_DrawString(x, y, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "Level is not loaded."); + + INT32 datew = 0; + + if (replaydemolist->date[0] != '\0') + { + datew = V_StringWidth(replaydemolist->date, 0); + V_DrawThinString(x, y+9, V_SNAPTOTOP|V_ALLOWLOWERCASE, va("%s", replaydemolist->date)); + } + + if (replaydemolist->numlaps) + V_DrawThinString(x+datew, y+9, V_SNAPTOTOP|V_ALLOWLOWERCASE, va("(%d laps)", replaydemolist->numlaps)); + + V_DrawString(x, y+20, V_SNAPTOTOP|V_ALLOWLOWERCASE, replaydemolist->gametype == GT_RACE ? + va("Race (%s speed)", kartspeed_cons_t[replaydemolist->kartspeed & ~DF_ENCORE].strvalue) : + "Battle Mode"); + + if (!replaydemolist->standings[0].ranking) + { + // No standings were loaded! + V_DrawString(x, y+39, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "No standings available."); + break; + } + + V_DrawThinString(x, y+29, V_SNAPTOTOP|highlightflags|MENUCAPS, "Winner"); + V_DrawString(x+38, y+30, V_SNAPTOTOP|V_ALLOWLOWERCASE, replaydemolist->standings[0].name); + + if (replaydemolist->gametype == GT_RACE) + { + V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags|MENUCAPS, "Time"); + } + else + { + V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags|MENUCAPS, "Score"); + } + + const UINT32 timeorscore = replaydemolist->standings[0].timeorscore; + + if (timeorscore == (UINT32_MAX-1)) + { + V_DrawThinString(x+32, y+40-1, V_SNAPTOTOP|MENUCAPS, "No Contest"); + } + else if (replaydemolist->gametype == GT_RACE) + { + V_DrawRightAlignedString(x+84, y+40, V_SNAPTOTOP, va("%d'%02d\"%02d", + G_TicsToMinutes(timeorscore, true), + G_TicsToSeconds(timeorscore), + G_TicsToCentiseconds(timeorscore) + )); + } + else + { + V_DrawString(x+32, y+40, V_SNAPTOTOP, va("%d", timeorscore)); + } + + // Character face! + if (replaydemolist->standings[0].skin < numskins && W_CheckNumForName(skins[replaydemolist->standings[0].skin].facewant) != LUMPERROR) + { + patch = facewantprefix[replaydemolist->standings[0].skin]; + colormap = R_GetTranslationColormap( + replaydemolist->standings[0].skin, + replaydemolist->standings[0].color, + GTC_MENUCACHE); + } + else + { + patch = (patch_t *)W_CachePatchName("M_NOWANT", PU_PATCH); + colormap = R_GetTranslationColormap( + TC_RAINBOW, + replaydemolist->standings[0].color, + GTC_MENUCACHE); + } + + V_DrawMappedPatch(BASEVIDWIDTH-15 - patch->width, y+20, V_SNAPTOTOP, patch, colormap); + + break; } } @@ -4629,7 +4632,7 @@ static void M_DrawReplayHut(void) if (i == itemOn) cursory = localy; - if ((currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING) + if ((currentMenu->menuitems[i].status & IT_DISPLAY) == IT_STRING) V_DrawString(x, localy, V_SNAPTOTOP|V_SNAPTOLEFT, currentMenu->menuitems[i].text); else V_DrawString(x, localy, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[i].text); @@ -4709,8 +4712,7 @@ static void M_DrawReplayHut(void) } // Draw the cursor - V_DrawScaledPatch(currentMenu->x - 24, cursory, V_SNAPTOTOP|V_SNAPTOLEFT, - (patch_t *)W_CachePatchName("M_CURSOR", PU_PATCH)); + V_DrawScaledPatch(currentMenu->x - 24, cursory, V_SNAPTOTOP|V_SNAPTOLEFT, (patch_t *)W_CachePatchName("M_CURSOR", PU_PATCH)); V_DrawString(currentMenu->x, cursory, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[itemOn].text); // Now draw some replay info! @@ -4742,34 +4744,38 @@ static void M_DrawReplayStartMenu(void) M_DrawGenericBackgroundMenu(); + const menudemo_t *replaydemolist = &demolist[dir_on[menudepthleft]]; + #define STARTY 62-(replayScrollTitle>>1) // Draw rankings beyond first - for (i = 1; i < MAXPLAYERS && demolist[dir_on[menudepthleft]].standings[i].ranking; i++) + for (i = 1; i < MAXPLAYERS && replaydemolist->standings[i].ranking; i++) { patch_t *patch; UINT8 *colormap; - V_DrawRightAlignedString(BASEVIDWIDTH-100, STARTY + i*20, V_SNAPTOTOP|highlightflags, va("%2d", demolist[dir_on[menudepthleft]].standings[i].ranking)); - V_DrawThinString(BASEVIDWIDTH-96, STARTY + i*20, V_SNAPTOTOP|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].standings[i].name); + V_DrawRightAlignedString(BASEVIDWIDTH-100, STARTY + i*20, V_SNAPTOTOP|highlightflags, va("%2d", replaydemolist->standings[i].ranking)); + V_DrawThinString(BASEVIDWIDTH-96, STARTY + i*20, V_SNAPTOTOP|V_ALLOWLOWERCASE, replaydemolist->standings[i].name); - if (demolist[dir_on[menudepthleft]].standings[i].timeorscore == UINT32_MAX-1) + const UINT32 timeorscore = replaydemolist->standings[i].timeorscore; + + if (timeorscore == UINT32_MAX-1) V_DrawThinString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, "NO CONTEST"); - else if (demolist[dir_on[menudepthleft]].gametype == GT_RACE) + else if (replaydemolist->gametype == GT_RACE) V_DrawRightAlignedString(BASEVIDWIDTH-40, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d'%02d\"%02d", - G_TicsToMinutes(demolist[dir_on[menudepthleft]].standings[i].timeorscore, true), - G_TicsToSeconds(demolist[dir_on[menudepthleft]].standings[i].timeorscore), - G_TicsToCentiseconds(demolist[dir_on[menudepthleft]].standings[i].timeorscore) + G_TicsToMinutes(timeorscore, true), + G_TicsToSeconds(timeorscore), + G_TicsToCentiseconds(timeorscore) )); else - V_DrawString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d", demolist[dir_on[menudepthleft]].standings[i].timeorscore)); + V_DrawString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d", timeorscore)); // Character face! - if (demolist[dir_on[menudepthleft]].standings[i].skin < numskins && W_CheckNumForName(skins[demolist[dir_on[menudepthleft]].standings[i].skin].facerank) != LUMPERROR) + if (replaydemolist->standings[i].skin < numskins && W_CheckNumForName(skins[replaydemolist->standings[i].skin].facerank) != LUMPERROR) { - patch = facerankprefix[demolist[dir_on[menudepthleft]].standings[i].skin]; + patch = facerankprefix[replaydemolist->standings[i].skin]; colormap = R_GetTranslationColormap( - demolist[dir_on[menudepthleft]].standings[i].skin, - demolist[dir_on[menudepthleft]].standings[i].color, + replaydemolist->standings[i].skin, + replaydemolist->standings[i].color, GTC_MENUCACHE); } else @@ -4777,7 +4783,7 @@ static void M_DrawReplayStartMenu(void) patch = (patch_t *)W_CachePatchName("M_NORANK", PU_PATCH); colormap = R_GetTranslationColormap( TC_RAINBOW, - demolist[dir_on[menudepthleft]].standings[i].color, + replaydemolist->standings[i].color, GTC_MENUCACHE); } @@ -4814,10 +4820,10 @@ static void M_DrawReplayStartMenu(void) V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|239); DrawReplayHutReplayInfo(); - V_DrawString(10, 72, V_SNAPTOTOP|highlightflags|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].title); + V_DrawString(10, 72, V_SNAPTOTOP|highlightflags|V_ALLOWLOWERCASE, replaydemolist->title); // Draw a warning prompt if needed - switch (demolist[dir_on[menudepthleft]].addonstatus) + switch (replaydemolist->addonstatus) { case DFILE_ERROR_CANNOTLOAD: warning = "Some addons in this replay cannot be loaded.\nYou can watch anyway, but desyncs may occur."; From 6b429e438802441ca92c0b627a82bf2c51bdfbf9 Mon Sep 17 00:00:00 2001 From: Indev Date: Fri, 5 Dec 2025 20:35:41 +0300 Subject: [PATCH 05/16] Add locatelump command --- src/d_netcmd.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index a0f6fe7f5..a3347e053 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -144,6 +144,7 @@ static void Command_Addfile(void); static void Command_Addskins(void); static void Command_GLocalSkin(void); static void Command_ListWADS_f(void); +static void Command_LocateLump_f(void); static void Command_ListDoomednums_f(void); static void Command_ListUnusedSprites_f(void); static void Command_RunSOC(void); @@ -638,6 +639,7 @@ void D_RegisterServerCommands(void) COM_AddCommand("addfile", Command_Addfile); COM_AddCommand("addskins", Command_Addskins); COM_AddCommand("listwad", Command_ListWADS_f); + COM_AddCommand("locatelump", Command_LocateLump_f); COM_AddCommand("listmapthings", Command_ListDoomednums_f); COM_AddCommand("listunusedsprites", Command_ListUnusedSprites_f); @@ -4722,6 +4724,31 @@ static void Command_ListWADS_f(void) } } +static void Command_LocateLump_f(void) +{ + if (COM_Argc() == 1) + { + CONS_Printf("Usage: locatelump [ [ ...]]\n"); + return; + } + + for (INT32 i = 1; i < COM_Argc(); ++i) + { + const char *name = COM_Argv(i); + + lumpnum_t num = W_CheckNumForName(name); + + const char *wadname = "(not found)"; + + if (num != LUMPERROR) + { + wadname = wadfiles[WADFILENUM(num)]->filename; + } + + CONS_Printf("%s - %s\n", name, wadname); + } +} + #define MAXDOOMEDNUM 4095 static void Command_ListDoomednums_f(void) From 2ae9563ab3cf9d716b016fa872847919ffcb4712 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Dec 2025 19:12:48 +0100 Subject: [PATCH 06/16] Menu: fix camera options from within accessability options returning to the main menu really wonky setup, but some other menus do similar things... --- src/m_menu.c | 23 +++++++++++++++++++---- src/m_menudefs.c | 6 +++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 1ce5dda09..bfe2372bf 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -256,6 +256,7 @@ static char *M_GetConditionString(condition_t cond); // Misc. Main Menu static void M_Options(INT32 choice); static void M_Multiplayer(INT32 choice); +static void M_CameraMenu(INT32 choice); static void M_LocalSkinMenu(INT32 choice); static void M_LocalSkinChange(INT32 choice); static void M_Manual(INT32 choice); @@ -648,22 +649,28 @@ void Nextmap_OnChange(void) SP_ReplayMenu[i].status = IT_DISABLED; SP_GuestReplayMenu[i].status = IT_DISABLED; } + SP_ReplayMenu[4].status = IT_DISABLED; SP_GhostMenu[3].status = IT_DISABLED; SP_GhostMenu[4].status = IT_DISABLED; - if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, cv_chooseskin.string))) { + if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, cv_chooseskin.string))) + { SP_ReplayMenu[0].status = IT_WHITESTRING|IT_CALL; SP_GuestReplayMenu[0].status = IT_WHITESTRING|IT_CALL; active |= 3; } - if (FIL_FileExists(va("%s-%s-lap-best.lmp", gpath, cv_chooseskin.string))) { + + if (FIL_FileExists(va("%s-%s-lap-best.lmp", gpath, cv_chooseskin.string))) + { SP_ReplayMenu[1].status = IT_WHITESTRING|IT_CALL; SP_GuestReplayMenu[1].status = IT_WHITESTRING|IT_CALL; active |= 3; } - if (FIL_FileExists(va("%s-%s-last.lmp", gpath, cv_chooseskin.string))) { + + if (FIL_FileExists(va("%s-%s-last.lmp", gpath, cv_chooseskin.string))) + { SP_ReplayMenu[2].status = IT_WHITESTRING|IT_CALL; SP_GuestReplayMenu[2].status = IT_WHITESTRING|IT_CALL; active |= 3; @@ -686,7 +693,8 @@ void Nextmap_OnChange(void) active |= 1; } - if (active) { + if (active) + { if (active & 1) SP_TimeAttackMenu[tareplay].status = IT_WHITESTRING|IT_SUBMENU; if (active & 2) @@ -9784,6 +9792,13 @@ static void M_DrawHUDOptions(void) V_DrawRightAlignedString(x, y, highlightflags, "("); } +static void M_CameraMenu(INT32 choice) +{ + (void)choice; + OP_CamOptionsDef.prevMenu = currentMenu; + M_SetupNextMenu(&OP_CamOptionsDef); +} + static void M_LocalSkinMenu(INT32 choice) { (void)choice; diff --git a/src/m_menudefs.c b/src/m_menudefs.c index fa5e66cfe..3d8d9549a 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -600,7 +600,7 @@ static menuitem_t OP_MainMenu[] = {IT_SUBMENU|IT_STRING, NULL, "Game Focus Options...", &OP_FocusOptionsDef, 33}, {IT_SUBMENU|IT_STRING, NULL, "HUD Options...", &OP_HUDOptionsDef, 46}, - {IT_SUBMENU|IT_STRING, NULL, "Camera Options...", &OP_CamOptionsDef, 56}, + {IT_CALL|IT_STRING, NULL, "Camera Options...", M_CameraMenu, 56}, {IT_SUBMENU|IT_STRING, NULL, "Gameplay Options...", &OP_GameOptionsDef, 66}, {IT_SUBMENU|IT_STRING, NULL, "Server Options...", &OP_ServerOptionsDef, 76}, @@ -610,7 +610,7 @@ static menuitem_t OP_MainMenu[] = {IT_CALL|IT_STRING, NULL, "Tricks & Secrets (F1)", M_Manual, 109}, {IT_CALL|IT_STRING, NULL, "Play Credits", M_Credits, 119}, - {IT_SUBMENU|IT_STRING, NULL, "Accessibility Options...",&OP_AccessibilityDef, 132}, + {IT_SUBMENU|IT_STRING, NULL, "Accessibility Options...", &OP_AccessibilityDef, 132}, {IT_SUBMENU|IT_STRING, NULL, "Saturn Options...", &OP_SaturnDef, 142}, {IT_SUBMENU|IT_STRING, NULL, "Bird...", &OP_BirdDef, 152}, @@ -1646,7 +1646,7 @@ static menuitem_t OP_AccessibilityMenu[] = {IT_STRING|IT_CVAR, NULL, "Quake Screenshakes", &cv_screenquake, 60}, - {IT_SUBMENU|IT_STRING, NULL, "Camera Options...", &OP_CamOptionsDef, 65}, + {IT_CALL|IT_STRING, NULL, "Camera Options...", M_CameraMenu, 65}, {IT_HEADER, NULL, "Audio", NULL, 75}, From 0bb63ee0afe5e43109dcb410004d695db150f75f Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 6 Dec 2025 17:34:00 +0300 Subject: [PATCH 07/16] Use size_t there --- src/d_netcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index a3347e053..8fca12794 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -4732,7 +4732,7 @@ static void Command_LocateLump_f(void) return; } - for (INT32 i = 1; i < COM_Argc(); ++i) + for (size_t i = 1; i < COM_Argc(); ++i) { const char *name = COM_Argv(i); From f578781418ef0c4281e9c41bb65e834581662848 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 6 Dec 2025 15:45:45 +0100 Subject: [PATCH 08/16] put "string.c" earliest in sourcefile otherwise Windows is unable to find nongnu_strcasestr --- src/Sourcefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sourcefile b/src/Sourcefile index 761806e6b..08c18ebf0 100644 --- a/src/Sourcefile +++ b/src/Sourcefile @@ -1,3 +1,4 @@ +string.c am_map.c b_bot.c command.c @@ -42,7 +43,6 @@ s_sound.c screen.c sounds.c st_stuff.c -string.c tables.c v_video.c w_wad.c From 3bdc745bd15f5742c41f560c5f7c397bc5ca8a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Sat, 6 Dec 2025 14:05:06 +0100 Subject: [PATCH 09/16] Fix use-after-free when mobj is removed while still playing sounds --- src/p_setup.c | 2 ++ src/s_sound.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/p_setup.c b/src/p_setup.c index b7b8f03d5..2993bb5d2 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -812,6 +812,8 @@ static void P_LoadSectors(UINT8 *data) ss->tag = SHORT(ms->tag); ss->flags |= SF_FLIPSPECIAL_FLOOR; + + ss->soundorg.thinker.function = (actionf_p1)P_MobjThinker; } // set the sky flat num diff --git a/src/s_sound.c b/src/s_sound.c index 5bc830252..651d579b8 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -772,9 +772,14 @@ void S_UpdateSounds(void) volume = c->volume; // 8 bits internal volume precision sep = NORM_SEP; + if (P_MobjWasRemoved(c->origin)) + { + // origin was removed, stop the music + S_StopChannel(cnum); + } // check non-local sounds for distance clipping // or modify their params - if (c->origin) + else { boolean itsUs = false; From 3f2e0bd3495ed3828ff9beae5967c8bdddb5bb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Sat, 6 Dec 2025 15:37:02 +0100 Subject: [PATCH 10/16] Fix memory leak in AATree string trees --- src/m_aatree.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/m_aatree.c b/src/m_aatree.c index f78355eaf..7fb847aab 100644 --- a/src/m_aatree.c +++ b/src/m_aatree.c @@ -49,17 +49,19 @@ aatree_t *M_AATreeAlloc(UINT32 flags) return aatree; } -static void M_AATreeFree_Node(aatree_node_t *node) +static void M_AATreeFree_Node(aatree_node_t *node, bool is_string) { - if (node->left) M_AATreeFree_Node(node->left); - if (node->right) M_AATreeFree_Node(node->right); + if (node->left) M_AATreeFree_Node(node->left, is_string); + if (node->right) M_AATreeFree_Node(node->right, is_string); + if (is_string) + Z_Free(node->value); Z_Free(node); } void M_AATreeFree(aatree_t *aatree) { if (aatree->root) - M_AATreeFree_Node(aatree->root); + M_AATreeFree_Node(aatree->root, (aatree->flags & AATREE_STRING) == AATREE_STRING); Z_Free(aatree); } From a191c8b71ebc2c73794a586423684d6c94e78b29 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 7 Dec 2025 19:03:26 +0100 Subject: [PATCH 11/16] g_demo: screw you LF2_EXISTSHACK --- src/g_demo.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/g_demo.c b/src/g_demo.c index f828d0343..4c3219368 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -2795,7 +2795,7 @@ void G_DoPlayDemo(char *defdemoname) demobuf.p += 4; // Extrainfo location // ...*map* not loaded? - if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK)) + if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1]) { snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); @@ -2836,6 +2836,16 @@ void G_DoPlayDemo(char *defdemoname) return; } + // ...*map* not loaded? + if (!(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK)) + { + snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname); + CONS_Alert(CONS_ERROR, "%s", msg); + M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER); + G_ResetDemoPlayback(); + return; + } + // Set color for (i = 0; i < MAXSKINCOLORS; i++) { From ed758fc9217361a6904158800646c70d7041fa6f Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 7 Dec 2025 20:23:47 +0100 Subject: [PATCH 12/16] g_demo: check for maplump existance directly cant really rely on mapheaderinfo to tell us if some map exists or not --- src/g_demo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/g_demo.c b/src/g_demo.c index 4c3219368..a714f8e48 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -2795,7 +2795,7 @@ void G_DoPlayDemo(char *defdemoname) demobuf.p += 4; // Extrainfo location // ...*map* not loaded? - if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1]) + if (!gamemap || (gamemap > NUMMAPS) || (W_CheckNumForName(G_BuildMapName(gamemap)) == LUMPERROR)) { snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); @@ -2837,7 +2837,7 @@ void G_DoPlayDemo(char *defdemoname) } // ...*map* not loaded? - if (!(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK)) + if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK)) { snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); From 3cb4e86b480000bdfab1f75c46e2c63b1c0452f5 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 7 Dec 2025 19:51:29 +0100 Subject: [PATCH 13/16] i_system: "fix" recursive i_quit well this still aint working all to great, but atleast this allows me to quit the game if it gets stuck without having to always send a kill signal to it copy pasted from what the dedicated build does --- src/sdl/i_system.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 00250bf4f..8cb67c9d6 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1851,17 +1851,20 @@ INT32 I_StartupSystem(void) return 0; } +boolean is_quitting = false; + // // I_Quit // FUNCNORETURN void ATTRNORETURN I_Quit(void) { - static SDL_bool quiting = SDL_FALSE; - /* prevent recursive I_Quit() */ - if (quiting) goto death; + if (is_quitting) + abort(); + + is_quitting = true; SDL_ShowCursor(SDL_TRUE); - quiting = SDL_FALSE; + I_ShutdownConsole(); M_SaveConfig(NULL); //save game config, cvars.. D_SaveBan(); // save the ban list @@ -1888,7 +1891,7 @@ FUNCNORETURN void ATTRNORETURN I_Quit(void) } if (myargmalloc) free(myargv); // Deallocate allocated memory -death: + W_Shutdown(); exit(0); } From a2feaa7fde4c2d3138cf21c40c2f8f671fac78ad Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 7 Dec 2025 20:22:25 +0100 Subject: [PATCH 14/16] dont call I_Quit from within "quit_handler", let it signal main loop to quit fixes an issue for me which led to having the game threads getting stuck when sending an interrupt signal to the game due to some thread issues with the sdl subsystems shoutout to dsda doom for this --- src/d_main.c | 3 +++ src/dedicated/i_system.c | 12 ++++++++++-- src/i_system.h | 3 ++- src/sdl/i_system.cpp | 22 ++++++++++------------ src/sdl/i_video.c | 3 ++- src/sdl/mixer_sound.c | 3 ++- 6 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index c46ef0c44..ab10af215 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -679,6 +679,9 @@ void D_SRB2Loop(void) for (;;) { + if (I_Interrupted()) + I_Quit(); + // capbudget is the minimum precise_t duration of a single loop iteration precise_t capbudget; precise_t elapsed; diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index 31eaf0346..5edb71a99 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -1075,11 +1075,19 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) } #endif -FUNCNORETURN static ATTRNORETURN void quit_handler(int num) +static volatile sig_atomic_t interrupted = 0; + +boolean I_Interrupted(void) +{ + return interrupted; +} + +static void quit_handler(int num) { signal(num, SIG_DFL); //default signal action raise(num); - I_Quit(); + //I_Quit(); + interrupted = true; } #ifdef HAVE_LIBBACKTRACE diff --git a/src/i_system.h b/src/i_system.h index 7084c655f..68d51f022 100644 --- a/src/i_system.h +++ b/src/i_system.h @@ -29,7 +29,6 @@ extern "C" { */ #define MAX_QUIT_FUNCS 16 - /** \brief Graphic system had started up */ extern UINT8 graphics_started; @@ -191,6 +190,8 @@ INT32 I_StartupSystem(void); */ void I_ShutdownSystem(void); +boolean I_Interrupted(void); + /** \brief The I_GetDiskFreeSpace function \param freespace a INT64 pointer to hold the free space amount diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 8cb67c9d6..60e5108ac 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1670,21 +1670,19 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) } #endif -FUNCNORETURN static ATTRNORETURN void quit_handler(int num) -{ -#ifdef HAVE_THREADS - if (g_main_thread_id != std::this_thread::get_id()) - { - // Do not attempt any sort of recovery if this signal triggers off the main thread - signal(num, SIG_DFL); - raise(num); - exit(-2); - } -#endif +static volatile sig_atomic_t interrupted = 0; +boolean I_Interrupted(void) +{ + return interrupted; +} + +static void quit_handler(int num) +{ signal(num, SIG_DFL); //default signal action raise(num); - I_Quit(); + //I_Quit(); + interrupted = true; } static void I_RegisterSignals(void) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index c2d87e3f1..ae2691359 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -2012,7 +2012,8 @@ void I_ShutdownGraphics(void) SDL_DestroyWindow(window); window = NULL; - SDL_QuitSubSystem(SDL_INIT_VIDEO); + if (SDL_WasInit(SDL_INIT_VIDEO) == SDL_INIT_VIDEO) + SDL_QuitSubSystem(SDL_INIT_VIDEO); framebuffer = SDL_FALSE; } diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 529b47399..c455aab01 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -237,7 +237,8 @@ void I_ShutdownSound(void) Mix_Quit(); #endif - SDL_QuitSubSystem(SDL_INIT_AUDIO); + if (SDL_WasInit(SDL_INIT_AUDIO) == SDL_INIT_AUDIO) + SDL_QuitSubSystem(SDL_INIT_AUDIO); #ifdef HAVE_LIBGME if (gme) From c19c80d79744671e5984364ecbb027f3d7d55448 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 7 Dec 2025 20:40:30 +0100 Subject: [PATCH 15/16] command.c: fix "alias" command crashing when no aliases were registered if we dont have aliases list how do we check the next alias in the list aswell? --- src/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/command.c b/src/command.c index 0cf1c85ff..7e0c34d03 100644 --- a/src/command.c +++ b/src/command.c @@ -652,7 +652,7 @@ static void COM_Alias_f(void) CONS_Printf(M_GetText("All aliases that start with \x87'%s'\x80 are:\n"), begin); int count = 0; - for (cmdalias_t *head = com_alias; head->next != NULL; head = head->next) + for (cmdalias_t *head = com_alias; head != NULL; head = head->next) { if (strncmp(begin, head->name, szBegin) == 0) { @@ -673,7 +673,7 @@ static void COM_Alias_f(void) /* Display alias subtext, show all aliases. */ CONS_Printf(M_GetText("alias : create a shortcut command that executes other command(s)\n")); - for (cmdalias_t *head = com_alias; head->next != NULL; head = head->next) + for (cmdalias_t *head = com_alias; head != NULL; head = head->next) { CONS_Printf(alias_format, head->name, head->value); } From eb4d9bbdd531710b51d90e2ec5aed610a4931ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Mon, 8 Dec 2025 21:14:54 +0100 Subject: [PATCH 16/16] Fix decompression warning when starting a server --- src/d_clisrv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index fa1536e72..8f2cc5afb 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1775,6 +1775,9 @@ static void SV_SendPlayerInfo(INT32 node) static void SV_SendMapIcon(INT32 node) { + if (node == 0) + return; + doomdata_t *netbuffer = DOOMCOM_DATA(doomcom); const char *map = va("%sP", G_BuildMapName(gamemap));