From eef1c55549a034eef15f188986eaf1dd893ea14b Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 13 Jun 2026 01:40:08 +0300 Subject: [PATCH 1/7] Add option for item roulette to use 'local' colors instead of player color --- src/k_hud.c | 36 ++++++++++++++++++++---------------- src/k_hud.h | 1 + src/m_menudefs.c | 31 +++++++++++++++++-------------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index a5f184f7b..e3a7f3ec5 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -109,6 +109,8 @@ consvar_t cv_huditemamount = {"showitemamountnumber", "Vanilla", CV_SAVE, hudite consvar_t cv_fancyroulette = {"animatedroulette", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_darkitembox = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // itembox gets a dark border with specific items consvar_t cv_multiitemicon = {"multiitemicon", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t roulettecolor_cons_t[] = {{0, "Player"}, {1, "Item"}, {0, NULL}}; +consvar_t cv_roulettecolor = {"roulettecolor", "Player", CV_SAVE, roulettecolor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showlaptimes = {"showlaptimes", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -243,6 +245,8 @@ void K_RegisterKartHudStuff(void) CV_RegisterVar(&cv_multiitemicon); CV_RegisterVar(&cv_huditemamount); + CV_RegisterVar(&cv_roulettecolor); + CV_RegisterVar(&cv_highresportrait); CV_RegisterVar(&cv_nametag); @@ -1514,67 +1518,67 @@ static void K_drawKartItem(void) // Each case is handled in threes, to give three frames of in-game time to see the item on the roulette case 0: // Sneaker localpatch = kp_sneaker[offset]; - //localcolor = SKINCOLOR_RASPBERRY; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_RASPBERRY; break; case 1: // Banana localpatch = kp_banana[offset]; - //localcolor = SKINCOLOR_YELLOW; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_YELLOW; break; case 2: // Orbinaut localpatch = kp_orbinaut[3+offset]; - //localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_STEEL; break; case 3: // Mine localpatch = kp_mine[offset]; - //localcolor = SKINCOLOR_JET; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_JET; break; case 4: // Grow localpatch = kp_grow[offset]; - //localcolor = SKINCOLOR_TEAL; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_TEAL; break; case 5: // Hyudoro localpatch = kp_hyudoro[offset]; - //localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_STEEL; break; case 6: // Rocket Sneaker localpatch = kp_rocketsneaker[offset]; - //localcolor = SKINCOLOR_TANGERINE; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_TANGERINE; break; case 7: // Jawz localpatch = kp_jawz[offset]; - //localcolor = SKINCOLOR_JAWZ; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_JAWZ; break; case 8: // Self-Propelled Bomb localpatch = kp_selfpropelledbomb[offset]; - //localcolor = SKINCOLOR_JET; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_JET; break; case 9: // Shrink localpatch = kp_shrink[offset]; - //localcolor = SKINCOLOR_ORANGE; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_ORANGE; break; case 10: // Invincibility localpatch = localinv; - //localcolor = SKINCOLOR_GREY; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_GREY; break; case 11: // Eggman Monitor localpatch = kp_eggman[offset]; - //localcolor = SKINCOLOR_ROSE; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_ROSE; break; case 12: // Ballhog localpatch = kp_ballhog[offset]; - //localcolor = SKINCOLOR_LILAC; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_LILAC; break; case 13: // Thunder Shield localpatch = kp_thundershield[offset]; - //localcolor = SKINCOLOR_CYAN; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_CYAN; break; /*case 14: // Pogo Spring localpatch = kp_pogospring[offset]; - localcolor = SKINCOLOR_TANGERINE; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_TANGERINE; break; case 15: // Kitchen Sink localpatch = kp_kitchensink[offset]; - localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_STEEL; break;*/ default: break; diff --git a/src/k_hud.h b/src/k_hud.h index ca38f43ea..45d5260d6 100644 --- a/src/k_hud.h +++ b/src/k_hud.h @@ -41,6 +41,7 @@ extern consvar_t cv_showlaptimes; extern consvar_t cv_battlespeedo; extern consvar_t cv_multiitemicon; extern consvar_t cv_huditemamount; +extern consvar_t cv_roulettecolor; // for use in timeattack menu extern patch_t *kp_facenum[MAXPLAYERS+1]; diff --git a/src/m_menudefs.c b/src/m_menudefs.c index 3189bbc1a..912ee3dec 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -1848,26 +1848,28 @@ static menuitem_t OP_SaturnHudMenu[] = {IT_STRING|IT_CVAR, NULL, "Item Amount Number", &cv_huditemamount, 110}, {IT_STRING|IT_CVAR, NULL, "Animated Roulette", &cv_fancyroulette, 115}, - {IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 125}, - {IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 130}, + {IT_STRING|IT_CVAR, NULL, "Item Roulette Color", &cv_roulettecolor, 120}, - {IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 140}, - {IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 145}, - {IT_STRING|IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 150}, - {IT_STRING|IT_CVAR, NULL, "Spin Minimap Icons", &cv_spinoutroll, 155}, - {IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 160}, + {IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 130}, + {IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 135}, - {IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 170}, - {IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 175}, + {IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 145}, + {IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 150}, + {IT_STRING|IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 155}, + {IT_STRING|IT_CVAR, NULL, "Spin Minimap Icons", &cv_spinoutroll, 160}, + {IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 165}, - {IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 185}, + {IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 175}, + {IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 180}, - {IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 195}, + {IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 190}, - {IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 205}, - {IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 210}, + {IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 200}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 220}, + {IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 210}, + {IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 215}, + + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 225}, }; static const char* OP_SaturnHudTooltips[] = @@ -1888,6 +1890,7 @@ static const char* OP_SaturnHudTooltips[] = "Use extra graphics for multiple sneakers, bananas and jawz.", "Change when the item amount is to be displayed.\nMultiple will always display the number.\nWhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.", "Enables an animation while the roulette is active.", + "Changes whether items in roulette have same color as player or an item-specific one.", "Show the big 'LAP' text on a lap change.", "Show the big Cecho Messages.", "Show player names on the minimap.", From 5f559af29c83790cf5637df4312acc9826ff0c6e Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 13 Jun 2026 02:12:23 +0300 Subject: [PATCH 2/7] Add more options to roulettecolor --- src/k_hud.c | 44 +++++++++++++++++++++++++------------------- src/m_menudefs.c | 2 +- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index e3a7f3ec5..a068bb7f8 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -109,8 +109,11 @@ consvar_t cv_huditemamount = {"showitemamountnumber", "Vanilla", CV_SAVE, hudite consvar_t cv_fancyroulette = {"animatedroulette", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_darkitembox = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // itembox gets a dark border with specific items consvar_t cv_multiitemicon = {"multiitemicon", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -static CV_PossibleValue_t roulettecolor_cons_t[] = {{0, "Player"}, {1, "Item"}, {0, NULL}}; -consvar_t cv_roulettecolor = {"roulettecolor", "Player", CV_SAVE, roulettecolor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; + +enum { ROULETTECOLOR_NONE = -1, ROULETTECOLOR_HUD, ROULETTECOLOR_PLAYER, ROULETTECOLOR_ITEM }; +static CV_PossibleValue_t roulettecolor_cons_t[] = { + {ROULETTECOLOR_NONE, "None"}, {ROULETTECOLOR_HUD, "Hud"}, {ROULETTECOLOR_PLAYER, "Player"}, {ROULETTECOLOR_ITEM, "Item"}, {0, NULL}}; +consvar_t cv_roulettecolor = {"roulettecolor", "Hud", CV_SAVE, roulettecolor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showlaptimes = {"showlaptimes", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -1505,7 +1508,7 @@ static void K_drawKartItem(void) INT32 maxl = 0; // itembar's normal highest value const INT32 barlength = (splitscreen > 1 ? 12 : 26); UINT8 localcolor = SKINCOLOR_NONE; - SINT8 colormode = TC_RAINBOW; + SINT8 colormode = cv_roulettecolor.value == ROULETTECOLOR_NONE ? TC_DEFAULT : TC_RAINBOW; UINT8 *colmap = NULL; UINT8 *colormap = NULL; @@ -1513,72 +1516,75 @@ static void K_drawKartItem(void) { localcolor = K_GetHudColor(); + if (cv_roulettecolor.value == ROULETTECOLOR_PLAYER) + localcolor = stplyr->skincolor; + switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3) { // Each case is handled in threes, to give three frames of in-game time to see the item on the roulette case 0: // Sneaker localpatch = kp_sneaker[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_RASPBERRY; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_RASPBERRY; break; case 1: // Banana localpatch = kp_banana[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_YELLOW; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_YELLOW; break; case 2: // Orbinaut localpatch = kp_orbinaut[3+offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; break; case 3: // Mine localpatch = kp_mine[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_JET; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET; break; case 4: // Grow localpatch = kp_grow[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_TEAL; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TEAL; break; case 5: // Hyudoro localpatch = kp_hyudoro[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; break; case 6: // Rocket Sneaker localpatch = kp_rocketsneaker[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_TANGERINE; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE; break; case 7: // Jawz localpatch = kp_jawz[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_JAWZ; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JAWZ; break; case 8: // Self-Propelled Bomb localpatch = kp_selfpropelledbomb[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_JET; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET; break; case 9: // Shrink localpatch = kp_shrink[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_ORANGE; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ORANGE; break; case 10: // Invincibility localpatch = localinv; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_GREY; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_GREY; break; case 11: // Eggman Monitor localpatch = kp_eggman[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_ROSE; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ROSE; break; case 12: // Ballhog localpatch = kp_ballhog[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_LILAC; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_LILAC; break; case 13: // Thunder Shield localpatch = kp_thundershield[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_CYAN; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_CYAN; break; /*case 14: // Pogo Spring localpatch = kp_pogospring[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_TANGERINE; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE; break; case 15: // Kitchen Sink localpatch = kp_kitchensink[offset]; - if (cv_roulettecolor.value == 1) localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; break;*/ default: break; diff --git a/src/m_menudefs.c b/src/m_menudefs.c index 912ee3dec..0f7b5736d 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -1890,7 +1890,7 @@ static const char* OP_SaturnHudTooltips[] = "Use extra graphics for multiple sneakers, bananas and jawz.", "Change when the item amount is to be displayed.\nMultiple will always display the number.\nWhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.", "Enables an animation while the roulette is active.", - "Changes whether items in roulette have same color as player or an item-specific one.", + "Changes the way items are colorized in roulette.", "Show the big 'LAP' text on a lap change.", "Show the big Cecho Messages.", "Show player names on the minimap.", From b24f6683b77076f64c01e04209de0f3bc5eb24c1 Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 13 Jun 2026 02:25:43 +0300 Subject: [PATCH 3/7] Use SKINCOLOR_NONE for ROULETTECOLOR_NONE instead of TC_DEFAULT --- src/k_hud.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index a068bb7f8..335e97340 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -1508,16 +1508,16 @@ static void K_drawKartItem(void) INT32 maxl = 0; // itembar's normal highest value const INT32 barlength = (splitscreen > 1 ? 12 : 26); UINT8 localcolor = SKINCOLOR_NONE; - SINT8 colormode = cv_roulettecolor.value == ROULETTECOLOR_NONE ? TC_DEFAULT : TC_RAINBOW; + SINT8 colormode = TC_RAINBOW; UINT8 *colmap = NULL; UINT8 *colormap = NULL; if (stplyr->kartstuff[k_itemroulette]) { - localcolor = K_GetHudColor(); - if (cv_roulettecolor.value == ROULETTECOLOR_PLAYER) localcolor = stplyr->skincolor; + else if (cv_roulettecolor.value != ROULETTECOLOR_NONE) + localcolor = K_GetHudColor(); switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3) { From cc6437285fa3be85ca439d2477b9bd6702ec753a Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 13 Jun 2026 12:58:29 +0200 Subject: [PATCH 4/7] =?UTF-8?q?check=20for=20missized=20rejectmatrix=C2=B4?= =?UTF-8?q?s=20on=20load,=20pad=20them=20if=20needed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this is what dsda-doom/prboom does ensures we wont crash from oob reads and makes us print a warning --- src/p_local.h | 8 +------- src/p_setup.c | 29 ++++++++++++++++++----------- src/p_sight.c | 7 ++----- src/y_inter.c | 2 +- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/p_local.h b/src/p_local.h index eb55f5dd4..383469bcc 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -414,13 +414,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object); // // P_SETUP // -typedef struct -{ - UINT8* data; - size_t size; -} reject_t; - -extern reject_t rejectmatrix; // for fast sight rejection +extern UINT8 *rejectmatrix; // for fast sight rejection extern INT32 *blockmaplump; // offsets in blockmap are from here extern INT32 *blockmap; // Big blockmap extern INT32 bmapwidth; diff --git a/src/p_setup.c b/src/p_setup.c index c8403538a..e8e654c3c 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -145,7 +145,7 @@ precipmobj_t **precipblocklinks = NULL; // Speeds up enemy AI by skipping detailed LineOf Sight calculation. // Without special effect, this could be used as a PVS lookup as well. // -reject_t rejectmatrix = {}; +UINT8 *rejectmatrix = NULL; // Maintain single and multi player starting spots. INT32 numdmstarts = 0, numcoopstarts = 0, numredctfstarts = 0, numbluectfstarts = 0; @@ -1780,23 +1780,29 @@ static void P_GroupLines(void) } } - // PK3 version // -- Monster Iestyn 09/01/18 -static void P_LoadReject(UINT8 *data, size_t count) +static void P_LoadReject(UINT8 *data, size_t rejectsize) { - if (!count) // zero length, someone probably used ZDBSP + const size_t neededsize = (numsectors * numsectors + 7) >> 3; + size_t allocsize = rejectsize; + + if (!rejectsize) // zero length, someone probably used ZDBSP { - rejectmatrix.data = NULL; + rejectmatrix = NULL; CONS_Debug(DBG_SETUP, "P_LoadReject: REJECT lump has size 0, will not be loaded\n"); } else { - rejectmatrix.data = Z_Malloc(count, PU_LEVEL, NULL); // allocate memory for the reject matrix - memcpy(rejectmatrix.data, data, count); // copy the data into it - } + if (rejectsize < neededsize) + { + CONS_Alert(CONS_WARNING, "REJECT is %lu byte%s too small. REJECT might be invalid and might crash vanilla clients!\n", (neededsize - rejectsize), (neededsize - rejectsize) == 1 ? "" : "s"); + allocsize = neededsize; + } - rejectmatrix.size = count; + rejectmatrix = Z_Calloc(allocsize, PU_LEVEL, NULL); // allocate memory for the reject matrix + memcpy(rejectmatrix, data, rejectsize); // copy the data into it + } } static void P_LoadMapBSP(const virtres_t* virt) @@ -1833,11 +1839,12 @@ static void P_LoadMapLUT(const virtres_t* virt) // Lookup tables if (virtreject) + { P_LoadReject(virtreject->data, virtreject->size); + } else { - rejectmatrix.data = NULL; - rejectmatrix.size = 0; + rejectmatrix = NULL; } if (!(virtblockmap && P_LoadRawBlockMap(virtblockmap->data, virtblockmap->size))) diff --git a/src/p_sight.c b/src/p_sight.c index 63b87820e..7bde2d737 100644 --- a/src/p_sight.c +++ b/src/p_sight.c @@ -373,13 +373,10 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast) s2 = t2->subsector->sector; pnum = (s1-sectors)*numsectors + (s2-sectors); - if (rejectmatrix.data != NULL) + if (rejectmatrix != NULL) { - const size_t shiftnum = pnum>>3; - // Check in REJECT table. - if (shiftnum < rejectmatrix.size && // check for overflow - (rejectmatrix.data[shiftnum] & (1 << (pnum&7)))) // can't possibly be connected + if (rejectmatrix[pnum>>3] & (1 << (pnum&7))) // can't possibly be connected { return false; } diff --git a/src/y_inter.c b/src/y_inter.c index 19b696b0e..a92392f39 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -586,7 +586,7 @@ void Y_Ticker(void) if (data.rankingsmode && intertic > sorttic+16+(2*TICRATE)) { - INT32 q=0,r=0; + INT32 q = 0, r = 0; boolean kaching = true; for (q = 0; q < data.numplayers; q++) From 2c1bb6c268cbd754d425b9eb3b2e44658692ff05 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 13 Jun 2026 13:06:37 +0200 Subject: [PATCH 5/7] smol optimize fof checks in P_CheckSight check if fof is solid before height comparisons, also split initial height comparisons to save on some height checks in some cases --- src/p_sight.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/p_sight.c b/src/p_sight.c index 7bde2d737..73c98f8f3 100644 --- a/src/p_sight.c +++ b/src/p_sight.c @@ -432,21 +432,30 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast) continue; } - topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y); - topz2 = P_GetFFloorTopZAt (rover, t2->x, t2->y); - bottomz1 = P_GetFFloorBottomZAt(rover, t1->x, t1->y); - bottomz2 = P_GetFFloorBottomZAt(rover, t2->x, t2->y); + if (rover->flags & FF_SOLID) + { + continue; // shortcut since neither mobj can be inside the 3dfloor + } // Check for blocking floors here. - if ((los.sightzstart < bottomz1 && t2->z >= topz2) - || (los.sightzstart >= topz1 && t2->z + t2->height < bottomz2)) + + topz2 = P_GetFFloorTopZAt (rover, t2->x, t2->y); + bottomz1 = P_GetFFloorBottomZAt(rover, t1->x, t1->y); + + if (los.sightzstart < bottomz1 && t2->z >= topz2) { // no way to see through that return false; } - if (rover->flags & FF_SOLID) - continue; // shortcut since neither mobj can be inside the 3dfloor + topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y); + bottomz2 = P_GetFFloorBottomZAt(rover, t2->x, t2->y); + + if (los.sightzstart >= topz1 && t2->z + t2->height < bottomz2) + { + // no way to see through that + return false; + } if (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES)) { From 14aaba7a879cfb7615af0d423f4bfa2fd4992151 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 13 Jun 2026 13:20:43 +0200 Subject: [PATCH 6/7] make reject matrix print an error instead of warning better on 2nd thought as this may crash vanilla clients that use nametags --- src/p_setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_setup.c b/src/p_setup.c index e8e654c3c..f0b931d27 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -1796,7 +1796,7 @@ static void P_LoadReject(UINT8 *data, size_t rejectsize) { if (rejectsize < neededsize) { - CONS_Alert(CONS_WARNING, "REJECT is %lu byte%s too small. REJECT might be invalid and might crash vanilla clients!\n", (neededsize - rejectsize), (neededsize - rejectsize) == 1 ? "" : "s"); + CONS_Alert(CONS_ERROR, "REJECT is %lu byte%s too small. REJECT might be invalid and might crash vanilla clients!\n", (neededsize - rejectsize), (neededsize - rejectsize) == 1 ? "" : "s"); allocsize = neededsize; } From 8129b89034b84819ef270560526b9f85924ed7cf Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 13 Jun 2026 13:34:43 +0200 Subject: [PATCH 7/7] port P_VerifyBlockMap from dsda-doom to check for blockmap issues that might cause crashes --- src/p_setup.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/src/p_setup.c b/src/p_setup.c index f0b931d27..95d3144b3 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -1625,6 +1625,80 @@ static void P_CreateBlockMap(void) } } +// +// P_VerifyBlockMap +// +// haleyjd 03/04/10: do verification on validity of blockmap. +// +static boolean P_VerifyBlockMap(INT32 count) +{ + // FIXME: should any of this shit be unsinged? + INT32 x, y; + INT32 *maxoffs = blockmaplump + count; + + //skipblstart = true; + + for (y = 0; y < bmapheight; y++) + { + for (x = 0; x < bmapwidth; x++) + { + INT32 offset; + INT32 *list, *tmplist; + INT32 *blockoffset; + + offset = y * bmapwidth + x; + blockoffset = blockmaplump + offset + 4; + + // check that block offset is in bounds + if (blockoffset >= maxoffs) + { + CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: block offset overflow\n"); + return false; + } + + offset = *blockoffset; + + // check that list offset is in bounds + if (offset < 4 || offset >= count) + { + CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: list offset overflow\n"); + return false; + } + + list = blockmaplump + offset; + + //if (*list != 0) + //skipblstart = false; + + // scan forward for a -1 terminator before maxoffs + for (tmplist = list; ; tmplist++) + { + // we have overflowed the lump? + if (tmplist >= maxoffs) + { + CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: open blocklist\n"); + return false; + } + + if (*tmplist == -1) // found -1 + break; + } + + // scan the list for out-of-range linedef indicies in list + for (tmplist = list; *tmplist != -1; tmplist++) + { + if (*tmplist < 0 || *tmplist >= (INT32)numlines) + { + CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: index >= numlines\n"); + return false; + } + } + } + } + + return true; +} + // Split from P_LoadBlockMap for convenience // -- Monster Iestyn 08/01/18 static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count) @@ -1669,6 +1743,14 @@ static boolean P_LoadRawBlockMap(UINT8 *data, size_t count) bmapwidth = blockmaplump[2]; bmapheight = blockmaplump[3]; + // haleyjd 03/04/10: check for blockmap problems + // http://www.doomworld.com/idgames/index.php?id=12935 + if (!P_VerifyBlockMap(count)) + { + CONS_Alert(CONS_ERROR, "P_LoadBlockMap: erroneous BLOCKMAP lump may cause crashes.\n"); + //CONS_Alert(CONS_NOTICE, "P_LoadBlockMap: use \"-blockmap\" command line switch for rebuilding\n"); + } + // clear out mobj chains count = sizeof (*blocklinks)* bmapwidth*bmapheight; blocklinks = Z_Calloc(count, PU_LEVEL, NULL);