From 30affaf451e4efbbc4296dfc2ff6fa5edeea473f Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 7 Oct 2026 09:52:58 +0200 Subject: [PATCH 01/25] cleanup saltyhop a little, move it to player struct --- src/d_player.h | 12 ++++++ src/k_kart.c | 114 ++++++++++++++++++++++--------------------------- src/p_mobj.h | 12 ------ src/p_user.c | 2 +- 4 files changed, 63 insertions(+), 77 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index e4aded95b..1813918f0 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -366,6 +366,15 @@ typedef struct squishdance_s fixed_t bounce; // hehe squishy } squishdance_t; +typedef struct salty_s +{ + bool ready; + bool tapping; + fixed_t zoffset; + fixed_t momz; + bool jump; +} salty_t; + // ======================================================================== // PLAYER STRUCTURE // ======================================================================== @@ -561,6 +570,9 @@ typedef struct player_s fixed_t spinoutrot; // When a player spins out, this value increments modulus 360. + // saltyhop! hardcode edition + salty_t salty; + squishdance_t squishdance; fixed_t fovadd; // adjust FOV for hw rendering diff --git a/src/k_kart.c b/src/k_kart.c index aaa5b4962..ebd6dc4d8 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -71,12 +71,11 @@ consvar_t cv_stairjank = {"stairjank", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistor consvar_t cv_stairjanksfx = {"stairjanksfx", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; //hardcode saltyhop mhhm -static void saltyhop_onchange(void); -consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_saltyhopsfx = {"hardcodehopsfx", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_saltysquish = {"hardcodehopsquish", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t saltyheight_t[] = {{FRACUNIT/4, "MIN"}, {2*FRACUNIT, "MAX"}, {0, NULL}}; -consvar_t cv_saltyheight = {"hardcodehopheight", "1", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, saltyheight_t, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_saltyheight = {"hardcodehopheight", "1", CV_FLOAT|CV_SAVE, saltyheight_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_saltyroll = {"hardcodehoproll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_squishdance = {"squishdance", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -84,23 +83,6 @@ consvar_t cv_squishdance = {"squishdance", "On", CV_SAVE, CV_OnOff, NULL, 0, NUL static CV_PossibleValue_t squishdancespeed_cons_t[] = {{20, "MIN"}, {280, "MAX"}, {0, NULL}}; consvar_t cv_squishdancespeed = {"squishdance_speed", "140", CV_SAVE, squishdancespeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -static void saltyhop_onchange(void) -{ - // reset everything when toggling saltyhop - if (gamestate != GS_LEVEL) - return; - - for (INT32 i = 0; i < MAXPLAYERS; i++) - { - player_t *player = &players[i]; - - if (!player || P_MobjWasRemoved(player->mo)) - continue; - - memset(&player->mo->salty, 0, sizeof(player->mo->salty)); - } -} - // SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H: // gamespeed is cc (0 for easy, 1 for normal, 2 for hard) // franticitems is Frantic Mode items, bool @@ -2194,7 +2176,7 @@ static void K_GetKartBoostPower(player_t *player) // Technically, all mobjs that think can cause desynchs if they are spawned conditionally, so best we can do // is to hide them if you are in saltyhop jump - if (dust && player->mo->salty.jump) + if (dust && player->salty.jump) dust->flags2 |= MF2_DONTDRAW; if (leveltime % 6 == 0) @@ -3404,88 +3386,92 @@ static void K_SaltySquish(player_t *player) static void K_QuiteSaltyHop(player_t *player) { - if (!cv_saltyhop.value) - return; + I_Assert(player != NULL); + I_Assert(!P_MobjWasRemoved(player->mo)); // what the fuck is this haya mobj_t *pmo = player->mo; - salty_t *psalt = &pmo->salty; + salty_t *psalty = &player->salty; + + if (!cv_saltyhop.value) + { + // reset before we leave + psalty->jump = psalty->ready = psalty->tapping = false; + psalty->momz = psalty->zoffset = 0; + return; + } + const boolean onground = P_IsObjectOnGround(pmo); // ready? if (!player->kartstuff[k_jmp]) { - psalt->ready = true; - psalt->tapping = false; + psalty->ready = true; + psalty->tapping = false; } - else if (psalt->ready) + else if (psalty->ready) { - psalt->ready = false; - psalt->tapping = true; + psalty->ready = false; + psalty->tapping = true; } else { - psalt->tapping = false; + psalty->tapping = false; } // GO! - if (!psalt->init) - { - psalt->jump = false; - psalt->zoffset = 0; - psalt->momz = 0; - psalt->init = true; - } - else if (psalt->jump) + if (psalty->jump) { if (pmo->eflags & MFE_JUSTHITFLOOR) { - psalt->zoffset = 0; + psalty->zoffset = 0; } else if (onground) { - psalt->zoffset += psalt->momz; - psalt->momz -= (FRACUNIT*3/2); + psalty->zoffset += psalty->momz; + psalty->momz -= (FRACUNIT*3/2); } else { - psalt->zoffset *= (49/50)*FRACUNIT; - psalt->momz = 0; + //psalty->zoffset *= (49/50)*FRACUNIT; // this just rounds down to 0 lol + psalty->zoffset = 0; + psalty->momz = 0; } - if (psalt->zoffset <= 0) + if (psalty->zoffset <= 0) { if (cv_saltyhopsfx.value && !(pmo->eflags & MFE_JUSTHITFLOOR) && onground) S_StartSound(pmo, sfx_s268); - psalt->jump = false; - psalt->zoffset = 0; - psalt->momz = 0; + psalty->jump = false; + psalty->zoffset = 0; + psalty->momz = 0; // shlamma damma if (cv_saltysquish.value) pmo->stretchslam += 8*FRACUNIT; } - else if (cv_saltysquish.value && psalt->zoffset >= 0) + else if (psalty->zoffset > 0) { - // goofy ahh hack - pmo->spriteyscale += (FRACUNIT/8); - pmo->spritexscale -= (FRACUNIT/8); + if (cv_saltysquish.value) + { + // goofy ahh hack + pmo->spriteyscale += (FRACUNIT/8); + pmo->spritexscale -= (FRACUNIT/8); + } } - pmo->spriteyoffset += FixedMul(psalt->zoffset, cv_saltyheight.value); + pmo->spriteyoffset += FixedMul(psalty->zoffset, cv_saltyheight.value); - if (cv_saltyhopsfx.value) - { - if (S_SoundPlaying(pmo, sfx_screec)) - S_StopSoundByID(pmo, sfx_screec); - if (S_SoundPlaying(pmo, sfx_drift)) - S_StopSoundByID(pmo, sfx_drift); - } + // Stop any and all drift sounds when hopping. + if (S_SoundPlaying(pmo, sfx_screec)) + S_StopSoundByID(pmo, sfx_screec); + if (S_SoundPlaying(pmo, sfx_drift)) + S_StopSoundByID(pmo, sfx_drift); } - else if (psalt->tapping && onground && !player->kartstuff[k_spinouttimer] && !player->kartstuff[k_squishedtimer]) + else if (psalty->tapping && onground && !player->kartstuff[k_spinouttimer] && !player->kartstuff[k_squishedtimer]) { - psalt->jump = true; - psalt->zoffset = 0; - psalt->momz = 6*FRACUNIT; + psalty->jump = true; + psalty->zoffset = 0; + psalty->momz = 6*FRACUNIT; if (cv_saltyhopsfx.value) S_StartSound(pmo, sfx_s25a); } @@ -3512,7 +3498,7 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj) return false; // seeing a character rotate mid-hop looks really janky - if (!cv_saltyroll.value && mobj->player && mobj->player->mo->salty.jump) + if (!cv_saltyroll.value && mobj->player && mobj->player->salty.jump) return false; return K_CheckSlopeRollDist(mobj); diff --git a/src/p_mobj.h b/src/p_mobj.h index face77ed2..d05457052 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -266,15 +266,6 @@ typedef enum { PCF_THUNK = 1<<5, // Ran the thinker this tic. } precipflag_t; -typedef struct salty_s -{ - bool init; - bool ready; - bool tapping; - fixed_t zoffset; - fixed_t momz; - bool jump; -} salty_t; // Map Object definition. typedef struct mobj_s @@ -412,9 +403,6 @@ typedef struct mobj_s tic_t slamsoundtimer; // Funni slam sound when landing - // saltyhop! hardcode edition - salty_t salty; - // WARNING: New fields must be added separately to savegame and Lua. boolean islocal; // BEWARE: islocal does not exist in vanilla, strictly to be used for locally loaded addons to not cause desynchs with the mobj linedef trigger check. DO NOT USE THIS IN ACTUAL ADDONS YOU INTEND TO USE ON YOUR SERVER } mobj_t; diff --git a/src/p_user.c b/src/p_user.c index ee1d45525..2fc5260e1 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4518,7 +4518,7 @@ static void P_DoFunnyDance(player_t *player) { fixed_t bpm; // 140bpm ish - if (player->spectator || !player->mo || player->kartstuff[k_respawn] || player->mo->salty.jump) // this looks jank as hell during hop + if (player->spectator || !player->mo || player->kartstuff[k_respawn] || player->salty.jump) // this looks jank as hell during hop return; player->squishdance.bounce = 0; From 116fbd93d0e3c4faa1a9d77edfeb2afa721e8dfd Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 7 Oct 2026 09:50:16 +0200 Subject: [PATCH 02/25] cleanup squishdance stuff a bit we dont need all those things saved per player really lol --- src/d_player.h | 3 --- src/p_user.c | 26 ++++++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index 1813918f0..075a64c69 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -361,9 +361,6 @@ typedef struct squishdance_s { tic_t countdown; // hold "custom 3" for 2 seconds to engange le dance tic_t time; - fixed_t work; - fixed_t ang; - fixed_t bounce; // hehe squishy } squishdance_t; typedef struct salty_s diff --git a/src/p_user.c b/src/p_user.c index 2fc5260e1..dd43d41fe 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4517,27 +4517,33 @@ static void DoABarrelRoll(player_t *player) static void P_DoFunnyDance(player_t *player) { fixed_t bpm; // 140bpm ish + fixed_t work, ang, bounce; // hehe squishy - if (player->spectator || !player->mo || player->kartstuff[k_respawn] || player->salty.jump) // this looks jank as hell during hop + I_Assert(player != NULL); + I_Assert(!P_MobjWasRemoved(player->mo)); + + if (player->spectator) return; - player->squishdance.bounce = 0; + // this looks jank as hell during hop or respawn + if (player->kartstuff[k_respawn] || player->salty.jump) + return; // bpm = FixedDiv((60*TICRATE)<squishdance.work = (player->squishdance.time << FRACBITS) % bpm; + work = (player->squishdance.time << FRACBITS) % bpm; if (player->squishdance.time >= (FRACUNIT >> 1)) // prevent overflow jump - takes about 15 minutes - player->squishdance.time = (player->squishdance.work >> FRACBITS); + player->squishdance.time = (work >> FRACBITS); - player->squishdance.work = FixedDiv(player->squishdance.work*180, bpm); + work = FixedDiv(work*180, bpm); - player->squishdance.ang = ((FixedAngle(player->squishdance.work) >> ANGLETOFINESHIFT) & FINEMASK); - player->squishdance.bounce = ((FINESINE(player->squishdance.ang) - FRACUNIT/2) / 2); + ang = ((FixedAngle(work) >> ANGLETOFINESHIFT) & FINEMASK); + bounce = ((FINESINE(ang) - FRACUNIT/2) / 2); - player->mo->spritexscale -= player->squishdance.bounce; - player->mo->spriteyscale += player->squishdance.bounce; + player->mo->spritexscale -= bounce; + player->mo->spriteyscale += bounce; player->squishdance.time++; } From 156400ffc2112aa1ce4620036f8e5f924341d17d Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 7 Oct 2026 20:23:56 +0200 Subject: [PATCH 03/25] fix arithmetic on NULL pointer when drawing 3d models caused by localskin code.... sigh...... noticed this while messing with dynamic allocated (local)skins --- src/hardware/hw_md2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index f21f2f82d..ab36fa20a 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1146,8 +1146,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr) // Look at HWR_ProjectSprite for more { - md2_t *md2s; - int skinnum; + md2_t *md2s = NULL; + int skinnum = 0; patch_t *gpatch, *blendgpatch; GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL; INT32 durs = spr->mobj->state->tics; @@ -1221,7 +1221,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) skinnum = (skin_t *)spr->mobj->localskin - skins; } } - else + else if (spr->mobj->skin) { md2s = md2_playermodels; skinnum = (skin_t *)spr->mobj->skin - skins; From 46a72bda8e7994a21d41e769fa56ec7f50c87150 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 8 Oct 2026 09:24:30 +0200 Subject: [PATCH 04/25] fix crash when applying localskin midgame --- src/k_hud.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/k_hud.c b/src/k_hud.c index 97f927a06..fcdcbd715 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -3830,9 +3830,10 @@ static void K_drawKartMinimap(void) else { const INT32 skinnum = K_GetMobjLocalSkinNum(mobj->skin, mobj->localskin, mobj->skinlocal); + const skin_t *skin = &K_GetSkinArray(mobj->skinlocal)[skinnum]; // special case if startcolor is not the default (160 / Green) - if (skinnum && skins[skinnum].starttranscolor != skins[0].starttranscolor) + if (skinnum && skin->starttranscolor != skins[0].starttranscolor) { colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE); } From 3183ec58abe31b65405fac24eae76e62156379a1 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 12 Oct 2026 15:13:38 +0200 Subject: [PATCH 05/25] simpler fix for localskin minimap angle display crash --- src/k_hud.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index fcdcbd715..260bac436 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -3829,11 +3829,8 @@ static void K_drawKartMinimap(void) } else { - const INT32 skinnum = K_GetMobjLocalSkinNum(mobj->skin, mobj->localskin, mobj->skinlocal); - const skin_t *skin = &K_GetSkinArray(mobj->skinlocal)[skinnum]; - // special case if startcolor is not the default (160 / Green) - if (skinnum && skin->starttranscolor != skins[0].starttranscolor) + if (K_GetMobjSkin(mobj)->starttranscolor != skins[0].starttranscolor) { colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE); } From 3b98d6c44fd6a172aa2269f76bb7545cab9b2d79 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 14 Oct 2026 13:56:15 +0200 Subject: [PATCH 06/25] addfilelocal/autoload: fix showing wrong error when file was not found W_CheckFileContains returns -1 if file was not found which still triggered those conditions so just handle if file was not found to skip doing other stuff in those cases --- src/d_main.c | 10 ++++++++-- src/p_setup.c | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index a3a769dac..5f31f53c9 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1149,13 +1149,19 @@ static void D_FindAddonsToAutoload(void) // ok so theres still issues with players adding stuff to autoload by accident // sometimes this stuff contains maps // you can probably imagine how that goes in a netgame.... - if (W_CheckAutoLoadContainsMap(wadsToAutoload)) + int retmap = W_CheckAutoLoadContainsMap(wadsToAutoload); + if (retmap == -1) + { + CONS_Alert(CONS_WARNING, "Autoload: file %s was not found or not valid.\n", wadsToAutoload); + continue; + } + if (retmap > 0) { CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload); continue; } - if (!postload && W_CheckPostLoadList(wadsToAutoload)) + if (!postload && W_CheckPostLoadList(wadsToAutoload) > 0) { CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload); postload = true; diff --git a/src/p_setup.c b/src/p_setup.c index 485c5e274..14a911743 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3424,7 +3424,13 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local) { // check if someone tries to load maps locally lol // do this here so we can skip loading the file anyways - if (W_CheckAutoLoadContainsMap(wadfilename)) + int retmap = W_CheckAutoLoadContainsMap(wadfilename); + if (retmap == -1) + { + CONS_Alert(CONS_WARNING, "addilelocal: file %s was not found or not valid.\n", wadfilename); + return UINT16_MAX; + } + if (retmap > 0) { CONS_Alert(CONS_WARNING, "addilelocal: locally added file %s contains map data, this WILL cause crashes and desynchs! not added.\n", wadfilename); return UINT16_MAX; From ba3429f4979c33e665d568412426aed2bbd9d7dc Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 15 Oct 2026 08:57:27 +0200 Subject: [PATCH 07/25] software: add helper for getting "wall lights" slightly less ugly --- src/r_segs.cpp | 44 ++++++-------------------------------------- src/r_segs.h | 5 +++++ src/r_things.cpp | 25 +++++-------------------- 3 files changed, 16 insertions(+), 58 deletions(-) diff --git a/src/r_segs.cpp b/src/r_segs.cpp index 3f6b9d449..2e982a5bf 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -61,7 +61,6 @@ fixed_t rw_distance = 0; static INT32 rw_x, rw_stopx; static angle_t rw_centerangle; static fixed_t rw_offset; -static fixed_t rw_offset2; // for splats static fixed_t rw_scale, rw_scalestep; static fixed_t rw_midtexturemid, rw_toptexturemid, rw_bottomtexturemid; static INT32 worldtop, worldbottom, worldhigh, worldlow; @@ -264,12 +263,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3 else if (P_ApplyLightOffset(lightnum, frontsector)) lightnum += curline->lightOffset; - if (lightnum < 0) - walllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - walllights = scalelight[LIGHTLEVELS - 1]; - else - walllights = scalelight[lightnum]; + walllights = R_GetWallLight(lightnum); } if (frontsector->heightsec != -1) @@ -371,12 +365,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3 lightnum = rlight->lightnum; - if (lightnum < 0) - xwalllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - xwalllights = scalelight[LIGHTLEVELS-1]; - else - xwalllights = scalelight[lightnum]; + xwalllights = R_GetWallLight(lightnum); pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT; @@ -824,12 +813,7 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf else if (P_ApplyLightOffset(lightnum, frontsector)) lightnum += curline->lightOffset; - if (lightnum < 0) - walllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - walllights = scalelight[LIGHTLEVELS-1]; - else - walllights = scalelight[lightnum]; + walllights = R_GetWallLight(lightnum); } maskedtexturecol = drawseg->thicksidecol; @@ -971,12 +955,7 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf lightnum = rlight->lightnum; - if (lightnum < 0) - xwalllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - xwalllights = scalelight[LIGHTLEVELS-1]; - else - xwalllights = scalelight[lightnum]; + xwalllights = R_GetWallLight(lightnum); pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT; @@ -1467,12 +1446,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc) else if (P_ApplyLightOffset(lightnum, curline->frontsector)) lightnum += curline->lightOffset; - if (lightnum < 0) - xwalllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - xwalllights = scalelight[LIGHTLEVELS-1]; - else - xwalllights = scalelight[lightnum]; + xwalllights = R_GetWallLight(lightnum); pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT; @@ -2551,7 +2525,6 @@ void R_StoreWallRange(INT32 start, INT32 stop) rw_offset = -rw_offset; /// don't use texture offset for splats - rw_offset2 = rw_offset + curline->offset; rw_offset += sidedef->textureoffset + curline->offset; rw_centerangle = ANGLE_90 + viewangle - rw_normalangle; @@ -2564,12 +2537,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (P_ApplyLightOffset(lightnum, frontsector)) lightnum += curline->lightOffset; - if (lightnum < 0) - walllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - walllights = scalelight[LIGHTLEVELS - 1]; - else - walllights = scalelight[lightnum]; + walllights = R_GetWallLight(lightnum); } // if a floor / ceiling plane is on the wrong side diff --git a/src/r_segs.h b/src/r_segs.h index c40fcd331..47b9499b6 100644 --- a/src/r_segs.h +++ b/src/r_segs.h @@ -22,6 +22,11 @@ extern "C" { #pragma interface #endif +FUNCINLINE static ATTRINLINE lighttable_t** R_GetWallLight(INT32 llevel) +{ + return scalelight[CLAMP(llevel, 0, LIGHTLEVELS-1)]; +} + void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2); void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor); void R_StoreWallRange(INT32 start, INT32 stop); diff --git a/src/r_things.cpp b/src/r_things.cpp index 79c280ee5..9d3bc19cb 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -1062,12 +1062,7 @@ static void R_SplitSprite(vissprite_t *sprite) { INT32 lightnum = R_GetSoftLightlevel(*sector->lightlist[i].lightlevel); - if (lightnum < 0) - spritelights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - spritelights = scalelight[LIGHTLEVELS-1]; - else - spritelights = scalelight[lightnum]; + spritelights = R_GetWallLight(lightnum); newsprite->extra_colormap = sector->lightlist[i].extra_colormap; @@ -1745,12 +1740,7 @@ static void R_ProjectSprite(mobj_t *thing) } } - if (lightnum < 0) - lights_array = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - lights_array = scalelight[LIGHTLEVELS-1]; - else - lights_array = scalelight[lightnum]; + lights_array = R_GetWallLight(lightnum); } // store information in a vissprite @@ -2087,16 +2077,11 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel) if (!sec->numlights) { - if (sec->heightsec == -1) lightlevel = sec->lightlevel; + if (sec->heightsec == -1) + lightlevel = sec->lightlevel; lightnum = R_GetSoftLightlevel(lightlevel); - - if (lightnum < 0) - spritelights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - spritelights = scalelight[LIGHTLEVELS-1]; - else - spritelights = scalelight[lightnum]; + spritelights = R_GetWallLight(lightnum); } // Handle all things in sector. From 1700db48b41a81a2b800d4342355e32fe010b0ce Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 15 Oct 2026 09:27:41 +0200 Subject: [PATCH 08/25] make player gravstretch and squish properly account for mapobjscale --- src/k_kart.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index ebd6dc4d8..b3c089edf 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3317,7 +3317,7 @@ static void K_StretchPlayerGravity(player_t *player) fixed_t tempxscale = pmo->realxscale; fixed_t tempyscale = pmo->realyscale; - stretchScaleFactor = FixedDiv(FRACUNIT*60, cv_gravstretch.value); + stretchScaleFactor = FixedDiv(mapobjectscale*60, cv_gravstretch.value); stretchScaleFactor = min(stretchScaleFactor, MAXSTRETCHDIV); if (pmo->slamsoundtimer) @@ -3325,26 +3325,26 @@ static void K_StretchPlayerGravity(player_t *player) if (!P_IsObjectOnGround(pmo)) { - fixed_t pzmom = abs(pmo->momz); + const fixed_t pzmom = abs(pmo->momz); const fixed_t stretchDiv = FixedDiv(pzmom, stretchScaleFactor); - if (abs(pzmom/FRACUNIT) != 0) + if (abs(pzmom/mapobjectscale) != 0) { - if (((tempxscale-(stretchDiv))) > (tempxscale/5)) + if ((tempxscale - stretchDiv) > (tempxscale / 5)) { pmo->spritexscale = (tempxscale - stretchDiv); pmo->stretchslam = pzmom; } else - pmo->spritexscale = (tempxscale/5); + pmo->spritexscale = (tempxscale / 5); - pmo->spriteyscale = (tempyscale + ((stretchDiv*2)/3)); + pmo->spriteyscale = (tempyscale + ((stretchDiv * 2) / 3)); } } else if (pmo->stretchslam > 0) { // Funni slam sound when landing - if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*FRACUNIT)) + if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*mapobjectscale)) { S_StartSound(pmo, sfx_s3k4c); pmo->slamsoundtimer = TICRATE; @@ -3352,9 +3352,9 @@ static void K_StretchPlayerGravity(player_t *player) const fixed_t slamDiv = FixedDiv(pmo->stretchslam, stretchScaleFactor); - pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2)); + pmo->spritexscale = (tempxscale + (((slamDiv * 2) / 3 ) * 2)); pmo->spriteyscale = (tempyscale - slamDiv); - pmo->stretchslam -= (4*FRACUNIT); + pmo->stretchslam -= (4*mapobjectscale); } else pmo->stretchslam = 0; @@ -3374,11 +3374,11 @@ static void K_SaltySquish(player_t *player) if (pmo->stretchslam > 0) { - const fixed_t slamDiv = FixedDiv(pmo->stretchslam, FRACUNIT*60); // stretchScaleFactor = FixedDiv(FRACUNIT*60, FRACUNIT) + const fixed_t slamDiv = FixedDiv(pmo->stretchslam, mapobjectscale*60); // stretchScaleFactor = FixedDiv(mapobjectscale*60, FRACUNIT) - pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2)); + pmo->spritexscale = (tempxscale + (((slamDiv * 2) / 3) * 2)); pmo->spriteyscale = (tempyscale - slamDiv); - pmo->stretchslam -= (4*FRACUNIT); + pmo->stretchslam -= (4*mapobjectscale); } else pmo->stretchslam = 0; @@ -3447,7 +3447,7 @@ static void K_QuiteSaltyHop(player_t *player) psalty->momz = 0; // shlamma damma if (cv_saltysquish.value) - pmo->stretchslam += 8*FRACUNIT; + pmo->stretchslam += 8*mapobjectscale; } else if (psalty->zoffset > 0) { From 98d4ab3e9d6bd16a6b72735516e440ff82027a36 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 15 Oct 2026 10:12:24 +0200 Subject: [PATCH 09/25] do not attempt to netsync locally spawned mobjs it is generally not really advised to locally load addons as a host as that might cause issues --- src/p_saveg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/p_saveg.c b/src/p_saveg.c index cde5765c4..166de7010 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1109,6 +1109,10 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 if (mobj->type == MT_HOOPCENTER && mobj->threshold == 4242) return; + // do not send over locally spawned mobjs + if (mobj->islocal) + return; + if (mobj->spawnpoint && mobj->info->doomednum != -1) { // spawnpoint is not modified but we must save it since it is an identifier From 19a7a4c5c1e5d175a421c56cbc251554e50cbb3b Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 15 Oct 2026 10:12:52 +0200 Subject: [PATCH 10/25] remove duped copyright --- src/r_draw_flush.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_draw_flush.cpp b/src/r_draw_flush.cpp index b135c6125..bb5e71b58 100644 --- a/src/r_draw_flush.cpp +++ b/src/r_draw_flush.cpp @@ -6,7 +6,7 @@ // Copyright (C) 1996 by id Software, Inc. // Copyright (C) 1999 by Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman // Copyright (C) 1999-2000 by Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze -// Copyright (C) Copyright 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko +// Copyright (C) 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko // Copyright (C) 2013 by James Haley, Stephen McGranahan, et al. // // This program is free software distributed under the From cea97226d538842585f5890505e8719b3ff69247 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 15 Oct 2026 14:52:49 +0200 Subject: [PATCH 11/25] fix driftdust and respawn lasers not accounting for mapobjectscale (but vanilla compatible) super annoying, but at least it looks right like that --- src/k_kart.c | 115 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 96 insertions(+), 19 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index b3c089edf..86ae4f135 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1809,25 +1809,56 @@ void K_RespawnChecker(player_t *player) mobj_t *mo; angle_t newangle; fixed_t newx, newy, newz; - +#ifdef PHOBOS_BUILD + const fixed_t fscale = player->mo->scale; +#else + static const fixed_t fscale = FRACUNIT; // does NOT use scale, since this effect doesn't scale properly +#endif newangle = FixedAngle(((360/8)*i)*FRACUNIT); - newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31<mo->y + P_ReturnThrustY(player->mo, newangle, 31<mo->x + P_ReturnThrustX(player->mo, newangle, 31 * fscale); + newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * fscale); if (player->mo->eflags & MFE_VERTICALFLIP) newz = player->mo->z + player->mo->height; else newz = player->mo->z; mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER); - if (mo) + if (!P_MobjWasRemovedCompat(mo)) { if (player->mo->eflags & MFE_VERTICALFLIP) mo->eflags |= MFE_VERTICALFLIP; P_SetTarget(&mo->target, player->mo); mo->angle = newangle+ANGLE_90; - mo->momz = (8<mo); - P_SetScale(mo, (mo->destscale = FRACUNIT)); + mo->momz = (8 * fscale) * P_MobjFlip(player->mo); + P_SetScale(mo, (mo->destscale = fscale)); } +#ifndef PHOBOS_BUILD + // vanilla compat really is annoying....... + // but this stuff is messed up on mobjscaled maps + // and we gotta respawn it locally to avoid desynchs... + if (mapobjectscale != FRACUNIT) + { + // hide the normal lazers! + mo->flags2 |= MF2_DONTDRAW; + + newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31 * player->mo->scale); + newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * player->mo->scale); + + // now spawn our local lazers + mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER); + if (!P_MobjWasRemovedCompat(mo)) + { + if (player->mo->eflags & MFE_VERTICALFLIP) + mo->eflags |= MFE_VERTICALFLIP; + P_SetTarget(&mo->target, player->mo); + mo->angle = newangle+ANGLE_90; + mo->momz = (8 * player->mo->scale) * P_MobjFlip(player->mo); + P_SetScale(mo, (mo->destscale = player->mo->scale)); + + mo->islocal = true; // Keep this local! + } + } +#endif } } } @@ -3205,10 +3236,8 @@ static void K_SpawnDriftSparks(player_t *player) for (i = 0; i < 2; i++) { - fixed_t driftExtraScale = 0; - - angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135); - fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale); + const angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135); + const fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale); newx = player->mo->x + P_ReturnThrustX(player->mo, thrustangle, smolscale); newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale); @@ -3220,9 +3249,9 @@ static void K_SpawnDriftSparks(player_t *player) spark->angle = travelangle-(ANGLE_45/5)*player->kartstuff[k_drift]; // scale increase while driftspark level gained timer is running - driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS); + const fixed_t driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS); spark->destscale = FixedMul(player->mo->scale, FRACUNIT + FixedMul(driftExtraScale, cv_driftsparkpulse.value)); - P_SetScale(spark, spark->destscale); // why not use what we calculated above? + P_SetScale(spark, spark->destscale); spark->momx = player->mo->momx/2; spark->momy = player->mo->momy/2; @@ -3710,7 +3739,7 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) dust = P_SpawnMobj(rand_x, rand_y, mo->z, MT_WIPEOUTTRAIL); P_SetTarget(&dust->target, mo); - dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy); + dust->angle = R_PointToAngle2(0, 0, mo->momx, mo->momy); dust->destscale = mo->scale; P_SetScale(dust, mo->scale); K_FlipFromObject(dust, mo); @@ -3736,6 +3765,11 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) void K_DriftDustHandling(mobj_t *spawner) { angle_t anglediff; +#ifdef PHOBOS_BUILD + const fixed_t fscale = spawner->scale; +#else + static const fixed_t fscale = FRACUNIT; // should be spawner->scale but the below calls P_Random! +#endif if (leveltime % 2 != 0 || !P_IsObjectOnGround(spawner)) return; @@ -3752,7 +3786,7 @@ void K_DriftDustHandling(mobj_t *spawner) { angle_t playerangle = spawner->angle; - if (spawner->player->speed < 5<player->speed < (5 * fscale)) return; if (spawner->player->cmd.forwardmove < 0) @@ -3763,7 +3797,7 @@ void K_DriftDustHandling(mobj_t *spawner) } else { - if (P_AproxDistance(spawner->momx, spawner->momy) < 5<momx, spawner->momy) < (5 * fscale)) return; anglediff = abs((signed)(spawner->angle - R_PointToAngle2(0, 0, spawner->momx, spawner->momy))); @@ -3776,13 +3810,29 @@ void K_DriftDustHandling(mobj_t *spawner) if (anglediff > ANG10*4) // Trying to turn further than 40 degrees { + mobj_t *dust = NULL; + fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST); - dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<scale)/4); - dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<scale)/4); - dust->momz = P_MobjFlip(spawner) * (P_RandomRange(1, 4) * (spawner->scale)); + + dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST); + + const INT32 momxrand = P_RandomRange(-speedrange, speedrange); + const INT32 momyrand = P_RandomRange(-speedrange, speedrange); + const INT32 momzrand = P_RandomRange(1, 4); + + if (P_MobjWasRemovedCompat(dust)) + return; + +#ifdef PHOBOS_BUILD + dust->momx = FixedMul(spawner->momx + (momxrand * spawner->scale), 3*FRACUNIT/4); + dust->momy = FixedMul(spawner->momy + (momyrand * spawner->scale), 3*FRACUNIT/4); +#else + dust->momx = FixedMul(spawner->momx + (momxrand<scale)/4); + dust->momy = FixedMul(spawner->momy + (momyrand<scale)/4); +#endif + dust->momz = P_MobjFlip(spawner) * (momzrand * (spawner->scale)); P_SetScale(dust, spawner->scale/2); dust->destscale = spawner->scale * 3; dust->scalespeed = spawner->scale/12; @@ -3791,6 +3841,33 @@ void K_DriftDustHandling(mobj_t *spawner) S_StartSound(spawner, sfx_screec); K_MatchGenericExtraFlags(dust, spawner); + +#ifndef PHOBOS_BUILD + // vanilla compat really is annoying....... + // but this stuff is messed up on mobjscaled maps + // and we gotta respawn it locally to avoid desynchs... + if (mapobjectscale != FRACUNIT) + { + // hide the normal dust! + dust->flags2 |= MF2_DONTDRAW; + + // now spawn our dust locally + dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST); + + if (P_MobjWasRemovedCompat(dust)) + return; + + dust->momx = FixedMul(spawner->momx + (momxrand * spawner->scale), 3*FRACUNIT/4); + dust->momy = FixedMul(spawner->momy + (momyrand * spawner->scale), 3*FRACUNIT/4); + dust->momz = P_MobjFlip(spawner) * (momzrand * (spawner->scale)); + P_SetScale(dust, spawner->scale/2); + dust->destscale = spawner->scale * 3; + dust->scalespeed = spawner->scale/12; + dust->islocal = true; // Keep this local! + + K_MatchGenericExtraFlags(dust, spawner); + } +#endif } } From a69fc07dcf33b8ffdfad92b6f5dff5193d7a32e3 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 15 Oct 2026 16:17:18 +0200 Subject: [PATCH 12/25] fix smoldering smoke not accounting for mapobject scale (but vanilla compatible) :chaosleep: --- src/p_mobj.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 5b9deaaf7..c58ed2e89 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6280,16 +6280,39 @@ static void P_MobjSceneryThink(mobj_t *mobj) case MT_SMOLDERING: if (leveltime % 2 == 0) { + mobj_t *smoke; fixed_t x = P_RandomRange(-35, 35)*mobj->scale; fixed_t y = P_RandomRange(-35, 35)*mobj->scale; fixed_t z = P_RandomRange(0, 70)*mobj->scale; - mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE); + smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE); P_SetMobjState(smoke, S_OPAQUESMOKE1); K_MatchGenericExtraFlags(smoke, mobj); smoke->scale = mobj->scale * 2; smoke->destscale = mobj->scale * 6; - smoke->momz = P_RandomRange(4, 9)*FRACUNIT*P_MobjFlip(smoke); + const INT32 momrand = P_RandomRange(4, 9); +#ifdef PHOBOS_BUILD + smoke->momz = momrand*mobj->scale*P_MobjFlip(smoke); +#else + smoke->momz = momrand*FRACUNIT*P_MobjFlip(smoke); + + // vanilla compat really is annoying....... + // but this stuff is messed up on mobjscaled maps + // so we gotta respawn it locally to avoid desynchs... + if (mapobjectscale != FRACUNIT) + { + // hide the smoke! + smoke->flags2 |= MF2_DONTDRAW; + + smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE); + P_SetMobjState(smoke, S_OPAQUESMOKE1); + K_MatchGenericExtraFlags(smoke, mobj); + smoke->scale = mobj->scale * 2; + smoke->destscale = mobj->scale * 6; + smoke->momz = momrand*mobj->scale*P_MobjFlip(smoke); + smoke->islocal = true; // Keep this local! + } +#endif } break; case MT_BOOMPARTICLE: From 14df9c01fafe901761045f58deecbbfff12b698c Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 15 Oct 2026 16:25:26 +0200 Subject: [PATCH 13/25] send over less mobj stuff in savegame on mobjscaled maps in some cases for phobos build none of this ever accounted for mapobjectscale sadly not vanilla compatible but oh well from https://gitlab.com/kart-krew-dev/ring-racers/-/commit/c4cca8c8b703b4bb23e27be4c3bfd37b9d092215 --- src/p_saveg.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/p_saveg.c b/src/p_saveg.c index 166de7010..77720934a 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1138,9 +1138,17 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0) #endif diff |= MD_MOM; +#ifdef PHOBOS_BUILD + if (mobj->radius != FixedMul(mapobjectscale, mobj->info->radius)) +#else if (mobj->radius != mobj->info->radius) +#endif diff |= MD_RADIUS; +#ifdef PHOBOS_BUILD + if (mobj->height != FixedMul(mapobjectscale, mobj->info->height)) +#else if (mobj->height != mobj->info->height) +#endif diff |= MD_HEIGHT; if (mobj->flags != mobj->info->flags) diff |= MD_FLAGS; @@ -1183,11 +1191,19 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 diff |= MD_MOVEFACTOR; if (mobj->fuse) diff |= MD_FUSE; +#ifdef PHOBOS_BUILD + if (mobj->watertop != INT32_MAX) +#else if (mobj->watertop) +#endif diff |= MD_WATERTOP; if (mobj->waterbottom) diff |= MD_WATERBOTTOM; +#ifdef PHOBOS_BUILD + if (mobj->scale != mapobjectscale) +#else if (mobj->scale != FRACUNIT) +#endif diff |= MD_SCALE; if (mobj->destscale != mobj->scale) diff |= MD_DSCALE; @@ -2094,11 +2110,19 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) if (diff & MD_RADIUS) mobj->radius = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->radius = FixedMul(mobj->info->radius, mapobjectscale); +#else mobj->radius = mobj->info->radius; +#endif if (diff & MD_HEIGHT) mobj->height = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->height = FixedMul(mobj->info->height, mapobjectscale); +#else mobj->height = mobj->info->height; +#endif if (diff & MD_FLAGS) mobj->flags = READUINT32(save->p); else @@ -2170,12 +2194,20 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) mobj->fuse = READINT32(save->p); if (diff & MD_WATERTOP) mobj->watertop = READFIXED(save->p); +#ifdef PHOBOS_BUILD + else + mobj->watertop = INT32_MAX; +#endif if (diff & MD_WATERBOTTOM) mobj->waterbottom = READFIXED(save->p); if (diff & MD_SCALE) mobj->scale = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->scale = mapobjectscale; +#else mobj->scale = FRACUNIT; +#endif if (diff & MD_DSCALE) mobj->destscale = READFIXED(save->p); else From 0eacda7494555518490ec8f27a7cc618185a06f5 Mon Sep 17 00:00:00 2001 From: SteelT Date: Thu, 8 Feb 2024 01:26:07 -0500 Subject: [PATCH 14/25] discord.c: Fix joinSecret memory leak --- src/discord.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/discord.c b/src/discord.c index a5e5f59c9..fd820bdfa 100644 --- a/src/discord.c +++ b/src/discord.c @@ -474,6 +474,7 @@ void DRPC_UpdatePresence(void) char charname[11+SKINNAMESIZE+1]; boolean joinSecretSet = false; + char *clientJoinSecret = NULL; DiscordRichPresence discordPresence; memset(&discordPresence, 0, sizeof(discordPresence)); @@ -530,7 +531,8 @@ void DRPC_UpdatePresence(void) // Grab the host's IP for joining. if ((join = DRPC_GetServerIP()) != NULL) { - discordPresence.joinSecret = DRPC_XORIPString(join); + clientJoinSecret = DRPC_XORIPString(join); + discordPresence.joinSecret = clientJoinSecret; joinSecretSet = true; } } @@ -712,6 +714,7 @@ void DRPC_UpdatePresence(void) } Discord_UpdatePresence(&discordPresence); + free(clientJoinSecret); } #endif // HAVE_DISCORDRPC From 090580badf456a86e4ca4b4260fabd4e3eacf0b1 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 17 Oct 2026 17:17:49 +0200 Subject: [PATCH 15/25] replace number with COM_SPLITSCREEN --- src/command.c | 1 + src/lua_consolelib.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/command.c b/src/command.c index 3ba7a2972..74a41abff 100644 --- a/src/command.c +++ b/src/command.c @@ -1739,6 +1739,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth) // send the value of the variable UINT8 buf[128]; UINT8 *p = buf; + if (!(server || (IsPlayerAdmin(consoleplayer)))) { CONS_Alert(CONS_NOTICE, "Only the server or admin can change: %s %s\n", var->name, var->string); diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c index 0f6b74f88..f82a6191e 100644 --- a/src/lua_consolelib.c +++ b/src/lua_consolelib.c @@ -182,14 +182,19 @@ void COM_Lua_f(void) len = (argc+1)*256; buf = malloc(len); + if (buf == NULL) + I_Error("Failed to allocate buffer for COM_Lua_f"); + p = buf; WRITEUINT8(p, argc); for (i = 0; i < argc; i++) WRITESTRINGN(p, COM_Argv(i), 255); - if (flags & 2) + + if (flags & COM_SPLITSCREEN) SendNetXCmdForPlayer(1, XD_LUACMD, buf, p-buf); else SendNetXCmd(XD_LUACMD, buf, p-buf); + free(buf); return; } From f4ac08d09f1d2f124aad16ff14321acf26c344ce Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 Oct 2026 12:46:47 +0100 Subject: [PATCH 16/25] some smaller mobj related things mostly cleanup and correctness fixes for phobos build --- src/k_kart.c | 8 +-- src/p_mobj.c | 135 +++++++++++++++++++++++++++++---------------------- src/p_mobj.h | 8 ++- src/p_user.c | 2 +- 4 files changed, 85 insertions(+), 68 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 86ae4f135..703df187f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3343,8 +3343,8 @@ static void K_StretchPlayerGravity(player_t *player) mobj_t *pmo = player->mo; - fixed_t tempxscale = pmo->realxscale; - fixed_t tempyscale = pmo->realyscale; + const fixed_t tempxscale = pmo->realxscale; + const fixed_t tempyscale = pmo->realyscale; stretchScaleFactor = FixedDiv(mapobjectscale*60, cv_gravstretch.value); stretchScaleFactor = min(stretchScaleFactor, MAXSTRETCHDIV); @@ -3398,8 +3398,8 @@ static void K_SaltySquish(player_t *player) mobj_t *pmo = player->mo; - fixed_t tempxscale = pmo->realxscale; - fixed_t tempyscale = pmo->realyscale; + const fixed_t tempxscale = pmo->realxscale; + const fixed_t tempyscale = pmo->realyscale; if (pmo->stretchslam > 0) { diff --git a/src/p_mobj.c b/src/p_mobj.c index c58ed2e89..7639b4c09 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9187,6 +9187,12 @@ static boolean P_MobjPushableThink(mobj_t *mobj) static void P_FiringThink(mobj_t *mobj) { + if (!mobj->target) + return; + + if (mobj->health <= 0) + return; + if (mobj->state->action == (actionf_p1)A_Boss1Laser) { var1 = mobj->state->var1; @@ -9249,7 +9255,12 @@ void P_MobjThinker(mobj_t *mobj) mobj->flags2 &= ~MF2_PUSHED; mobj->eflags &= ~(MFE_SPRUNG|MFE_JUSTBOUNCEDWALL); +#ifdef PHOBOS_BUILD + P_SetTarget(&tmfloorthing, NULL); + P_SetTarget(&tmhitthing, NULL); +#else tmfloorthing = tmhitthing = NULL; +#endif // do NOT trigger linedef executors for "local" mobjs if (!mobj->islocal) @@ -9265,8 +9276,13 @@ void P_MobjThinker(mobj_t *mobj) } if (mobj->scale != mobj->destscale) + { P_MobjScaleThink(mobj); // Slowly scale up/down to reach your destscale. + if (P_MobjWasRemovedCompat(mobj)) + return; + } + if (!mobj->player) { if (mobj->type == MT_GHOST && mobj->fuse > 0 // Not guaranteed to be MF_SCENERY or not MF_SCENERY! @@ -9311,6 +9327,21 @@ void P_MobjThinker(mobj_t *mobj) { if (!P_MobjDeadThink(mobj)) return; + + // Fading tile + if (mobj->type >= MT_BOUNCEPICKUP && mobj->type <= MT_GRENADEPICKUP) + { + INT32 value = mobj->info->damage/10; + value = mobj->fuse/value; + value = 10-value; + value--; + + if (value <= 0) + value = 1; + + mobj->frame &= ~FF_TRANSMASK; + mobj->frame |= value << FF_TRANSSHIFT; + } } else { @@ -9321,7 +9352,7 @@ void P_MobjThinker(mobj_t *mobj) if (P_MobjWasRemoved(mobj)) return; - if (mobj->flags2 & MF2_FIRING && mobj->target && mobj->health > 0) + if (mobj->flags2 & MF2_FIRING) P_FiringThink(mobj); if (mobj->flags & MF_AMBIENT) @@ -9388,23 +9419,27 @@ void P_MobjThinker(mobj_t *mobj) P_ButteredSlope(mobj); } - if (mobj->flags & (MF_ENEMY|MF_BOSS) && mobj->health && - P_CheckDeathPitCollide(mobj)) // extra pit check in case these didn't have momz + if (mobj->health) { - P_KillMobj(mobj, NULL, NULL); - return; - } - - // Crush enemies! - if (mobj->ceilingz - mobj->floorz < mobj->height) - { - if (((mobj->flags & (MF_ENEMY|MF_BOSS) && mobj->flags & MF_SHOOTABLE) || mobj->type == MT_EGGSHIELD) && - !(mobj->flags & MF_NOCLIPHEIGHT) && - mobj->health > 0) + // extra pit check in case these didn't have momz + if ((mobj->flags & (MF_ENEMY|MF_BOSS)) && + P_CheckDeathPitCollide(mobj)) { P_KillMobj(mobj, NULL, NULL); return; } + + // Crush enemies! + if ((mobj->ceilingz - mobj->floorz) < mobj->height) + { + if ((((mobj->flags & (MF_ENEMY|MF_BOSS)) && (mobj->flags & MF_SHOOTABLE)) || mobj->type == MT_EGGSHIELD) && + !(mobj->flags & MF_NOCLIPHEIGHT) && + mobj->health > 0) + { + P_KillMobj(mobj, NULL, NULL); + return; + } + } } if (P_MobjWasRemovedCompat(mobj)) @@ -9412,24 +9447,6 @@ void P_MobjThinker(mobj_t *mobj) // Can end up here if a player dies. P_CycleMobjState(mobj); - - if (P_MobjWasRemoved(mobj)) - return; - - if ((mobj->health == 0) && // Fading tile - (mobj->type >= MT_BOUNCEPICKUP && mobj->type <= MT_GRENADEPICKUP)) - { - INT32 value = mobj->info->damage/10; - value = mobj->fuse/value; - value = 10-value; - value--; - - if (value <= 0) - value = 1; - - mobj->frame &= ~FF_TRANSMASK; - mobj->frame |= value << FF_TRANSSHIFT; - } } // Quick, optimized function for the Rail Rings @@ -9683,20 +9700,13 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) // All mobjs are created at 100% scale. mobj->scale = FRACUNIT; - mobj->destscale = mobj->scale; - mobj->scalespeed = FRACUNIT/12; - - if (mapobjectscale != FRACUNIT) //&& !(mobj->type == MT_BLACKEGGMAN) - { - mobj->destscale = mapobjectscale; - mobj->scalespeed = mapobjectscale/12; - } + mobj->destscale = mapobjectscale; + mobj->scalespeed = mapobjectscale/12; // Sprite rendering mobj->blendmode = AST_TRANSLUCENT; - mobj->realxscale = mobj->realyscale = mobj->scale; - mobj->spritexscale = mobj->realxscale; - mobj->spriteyscale = mobj->realyscale; + mobj->realxscale = mobj->realyscale = + mobj->spritexscale = mobj->spriteyscale = mobj->scale; // set subsector and/or block links P_SetThingPosition(mobj); @@ -10138,20 +10148,13 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster) // All mobjs are created at 100% scale. mobj->scale = FRACUNIT; - mobj->destscale = mobj->scale; - mobj->scalespeed = FRACUNIT/12; - - if (mapobjectscale != FRACUNIT) //&& !(mobj->type == MT_BLACKEGGMAN) - { - mobj->destscale = mapobjectscale; - mobj->scalespeed = mapobjectscale/12; - } + mobj->destscale = mapobjectscale; + mobj->scalespeed = mapobjectscale/12; // Sprite rendering mobj->blendmode = AST_TRANSLUCENT; - mobj->realxscale = mobj->realyscale = mobj->scale; - mobj->spritexscale = mobj->realxscale; - mobj->spriteyscale = mobj->realyscale; + mobj->realxscale = mobj->realyscale = + mobj->spritexscale = mobj->spriteyscale = mobj->scale; // set subsector and/or block links P_SetThingPosition(mobj); @@ -10251,7 +10254,9 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype P_CalculatePrecipFloor(mobj); if (mobj->floorz != starting_floorz) - mobj->precipflags |= PCF_FOF; + { + ; //mobj->precipflags |= PCF_FOF; + } else { const INT32 special = GETSECSPECIAL(mobj->subsector->sector->special, 1); @@ -10385,7 +10390,13 @@ void P_RemoveMobj(mobj_t *mobj) // clear the reference from the mapthing if (mobj->spawnpoint) + { +#ifdef PHOBOS_BUILD + P_SetTarget(&mobj->spawnpoint->mobj, NULL); +#else mobj->spawnpoint->mobj = NULL; +#endif + } R_RemoveMobjInterpolator(mobj); @@ -10596,6 +10607,9 @@ void P_PrecipitationEffects(void) P_SpawnLightningFlash(ss); // Spawn a quick flash thinker } + if (sound_disabled) + return; // Sound off? D'aw, no fun. + const mobj_t *pmo = players[displayplayers[0]].mo; // Local effects from here on out! @@ -10603,9 +10617,6 @@ void P_PrecipitationEffects(void) if (!playeringame[displayplayers[0]] || !pmo) return; - if (sound_disabled) - return; // Sound off? D'aw, no fun. - const boolean sounds_rain = ((cv_drawdist_precip.value != 0) && rainsfx && (!leveltime || leveltime % 80 == 1)); if (!sounds_rain && !sounds_thunder) @@ -10853,7 +10864,9 @@ void P_SpawnPlayer(INT32 playernum) mobj_t *mobj; if (p->playerstate == PST_REBORN) + { G_PlayerReborn(playernum); + } for (i = 0; i < MAXPLAYERS; i++) { @@ -10927,9 +10940,15 @@ void P_SpawnPlayer(INT32 playernum) } mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER); + I_Assert(mobj != NULL); + +#ifdef PHOBOS_BUILD + mobj->player = p; + P_SetTarget(&p->mo, mobj); +#else (mobj->player = p)->mo = mobj; - //P_SetTarget(&p->mo, mobj); +#endif mobj->angle = mobj->old_angle = 0; diff --git a/src/p_mobj.h b/src/p_mobj.h index d05457052..2080ab451 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -258,12 +258,10 @@ typedef enum // PRECIPITATION flags ?! ?! ?! // typedef enum { - PCF_INVISIBLE = 1, // Don't draw. + PCF_INVISIBLE = 1, // Don't draw. PCF_PIT = 1<<1, // Above pit. - PCF_FOF = 1<<2, // Above FOF. - PCF_MOVINGFOF = 1<<3, // Above MOVING FOF (this means we need to keep floorz up to date...) - PCF_SPLASH = 1<<4, // Splashed on the ground, return to the ceiling after the animation's over - PCF_THUNK = 1<<5, // Ran the thinker this tic. + PCF_SPLASH = 1<<2, // Splashed on the ground, return to the ceiling after the animation's over + PCF_THUNK = 1<<3, // Ran the thinker this tic. } precipflag_t; diff --git a/src/p_user.c b/src/p_user.c index dd43d41fe..a79163308 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -91,7 +91,7 @@ void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move) mo->momx = FixedMul(move, FINECOSINE(angle)); if (!twodmo(mo)) - mo->momy = FixedMul(move,FINESINE(angle)); + mo->momy = FixedMul(move, FINESINE(angle)); } void P_InstaThrustEvenIn2D(mobj_t *mo, angle_t angle, fixed_t move) From 2210bd4e2d3288361537d94c9c21eafdf92b276e Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 Oct 2026 12:49:05 +0100 Subject: [PATCH 17/25] opengl: fix opaque fof planes checking the wrong sector for encore remap it should check its own "master" sector for remap behavior NOT the sector it resides in note: i did not change the ceiling/floor behavior here as i noticed there might be more issues than this with fofs --- src/hardware/hw_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 25acb72bc..4efaf513e 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -2962,7 +2962,7 @@ static void HWR_Subsector(size_t num) } else { - HWR_GetFlat(flatlump, R_NoEncore(gl_frontsector, !bottom)); + HWR_GetFlat(flatlump, R_NoEncore(rover->master->frontsector, !bottom)); light = R_GetPlaneLight(gl_frontsector, centerHeight, underside); HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump, From 07427b391e0704a66c02afd708038ce7b9b4cca7 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 1 Nov 2026 17:28:30 +0100 Subject: [PATCH 18/25] dont run horizonline code on fofs in opengl this currently does NOT work anyways and just wastes time for nothing on some maps --- src/hardware/hw_main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 4efaf513e..e05d923ee 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -610,7 +610,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool fflatsize = 1024.0f; flatflag = 1023; break; - case 262144:// 512x512 lump + case 262144: // 512x512 lump fflatsize = 512.0f; flatflag = 511; break; @@ -721,7 +721,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false); - if (gl_maphashorizonlines && subsector && cv_glhorizonlines.value) + if (gl_maphashorizonlines && subsector && !FOFsector && cv_glhorizonlines.value) { // Horizon lines FOutVector horizonpts[6]; @@ -742,7 +742,6 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool line_t* ld = line->linedef; - // this check sucks and is a hotspot lel if (LIKELY(ld->special != HORIZONSPECIAL)) continue; From c44d6f6aeb07da9d643ccf5d311bfab0c854c5ea Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 2 Nov 2026 14:31:53 +0100 Subject: [PATCH 19/25] update HWR precache stuff not much but matches stuff i did for blan --- src/hardware/hw_cache.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index 13354bda4..95e5d7822 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -625,13 +625,9 @@ static void HWR_PrecacheLevelFlats(void) // lookup for flats that may´ve been already loaded flatcheck flatpresent; size_t i; -#if 0 - size_t j; -#endif INT32 k; - // this kinda messes up encore remapping behavior at times - // so just disable it for now ig + // FIXME: this needs to account for FOFs to properly work #ifdef GLENCORE if (encoremap) { @@ -650,6 +646,7 @@ static void HWR_PrecacheLevelFlats(void) // go through all sectors to determine if it should be remapped for encore for (i = 0; i < numsectors; i++) { + size_t j; sector_t *sec = §ors[i]; // gotta check sector floor and ceiling @@ -738,7 +735,7 @@ static void HWR_PrecacheLevelTextures(void) { const line_t *line = &lines[i]; #ifdef GLENCORE - const int noencoremap = ((encoremap && (line->flags & ML_TFERLINE)) ? 2 : 1); + const boolean noencoremap = (encoremap && (line->flags & ML_TFERLINE)); #endif // two sides for (j = 0; j < 2; j++) @@ -755,25 +752,27 @@ static void HWR_PrecacheLevelTextures(void) { const INT32 texnum = sidetex[f]; - if (texnum < 0 || texnum >= (signed)gl_numtextures) + if (texnum < 0 || (unsigned)texnum >= gl_numtextures) continue; - if (texturepresent[texnum]) - continue; + if (!(texturepresent[texnum] & 1)) + { + texturepresent[texnum] |= 1; + HWR_GetTexture(texnum, false); + } #ifdef GLENCORE - texturepresent[texnum] = 1|noencoremap; -#else - texturepresent[texnum] = 1; -#endif - HWR_GetTexture(texnum, false); -#ifdef GLENCORE - if (noencoremap & 2) + if (noencoremap + && !(texturepresent[texnum] & 2)) + { + texturepresent[texnum] |= 2; HWR_GetTexture(texnum, true); + } #endif } } } + // check for animated textures for (anim = anims; anim < lastanim; anim++) { if (!anim->istexture) @@ -792,6 +791,7 @@ static void HWR_PrecacheLevelTextures(void) { HWR_GetTexture(animtexnum, false); } + #ifdef GLENCORE if (texpresent & 2) { @@ -913,7 +913,7 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore) GLMapTexture_t *gltex; GLMipmap_t *glMipmap; - if (tex < 0 || tex >= (signed)gl_numtextures) + if (tex < 0 || (unsigned)tex >= gl_numtextures) { #ifdef PARANOIA I_Error("HWR_GetTexture: Invalid texture ID %d", tex); From 1ba4fe99a75d0fcc66c85f533127a1de4f124eb9 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 2 Nov 2026 14:38:38 +0100 Subject: [PATCH 20/25] fix fof noencore ceiling checks being flipped in opengl renderer matches software now even if most custom maps were made with opengl in mind, stuff did not work anyways for years so this shouldnt hopefully cause any issues --- src/hardware/hw_main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index e05d923ee..67c7d5817 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -2961,7 +2961,7 @@ static void HWR_Subsector(size_t num) } else { - HWR_GetFlat(flatlump, R_NoEncore(rover->master->frontsector, !bottom)); + HWR_GetFlat(flatlump, R_NoEncore(rover->master->frontsector, bottom)); light = R_GetPlaneLight(gl_frontsector, centerHeight, underside); HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump, @@ -4286,7 +4286,10 @@ static void HWR_RenderDrawNodes(void) gl_frontsector = NULL; if (!(plane->blend & PF_NoTexture)) - HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, plane->isceiling)); + { + const boolean ceiling = plane->FOFSector ? !plane->isceiling : plane->isceiling; // match software! + HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, ceiling)); + } HWR_RenderPlane(NULL, plane->xsub, plane->isceiling, plane->fixedheight, plane->blend, plane->lightlevel, plane->lumpnum, plane->FOFSector, plane->alpha, plane->planecolormap); From e5c6cb635d6b9f43afc715946d5dbf945414b01b Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 2 Nov 2026 14:40:48 +0100 Subject: [PATCH 21/25] make teleporter handling in P_ProcessLineSpecial a little less ugly lulul --- src/p_spec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/p_spec.c b/src/p_spec.c index bc6267a7c..6752528a1 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -1962,13 +1962,19 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) if (!dest) return; + const angle_t ang = (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle; + const boolean dontstopmove = (line->flags & ML_EFFECT4) == ML_EFFECT4; + if (bot) - P_Teleport(bot, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, (line->flags & ML_BLOCKMONSTERS) == 0, (line->flags & ML_EFFECT4) == ML_EFFECT4); + P_Teleport(bot, dest->x, dest->y, dest->z, ang, (line->flags & ML_BLOCKMONSTERS) == 0, dontstopmove); + if (line->flags & ML_BLOCKMONSTERS) - P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, false, (line->flags & ML_EFFECT4) == ML_EFFECT4); + { + P_Teleport(mo, dest->x, dest->y, dest->z, ang, false, dontstopmove); + } else { - P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, true, (line->flags & ML_EFFECT4) == ML_EFFECT4); + P_Teleport(mo, dest->x, dest->y, dest->z, ang, true, dontstopmove); // Play the 'bowrwoosh!' sound S_StartSound(dest, sfx_mixup); } From 5183baed44e4d93cbe1e0345a0d87ac9f4ad6cb5 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 2 Nov 2026 14:40:01 +0100 Subject: [PATCH 22/25] make HWR_ApplyDispoffset a little less ugly lol --- src/hardware/hw_main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 67c7d5817..f862cf18e 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -3459,8 +3459,12 @@ static inline void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVert { HWR_RotateSpritePolyToAim(spr, wallVerts, false, papersprite); - const float sprdist = sqrtf((spr->x1 - gl_viewx)*(spr->x1 - gl_viewx) + (spr->z1 - gl_viewy)*(spr->z1 - gl_viewy) + (spr->gzt - gl_viewz)*(spr->gzt - gl_viewz)); - const float distfact = ((2.0f*spr->dispoffset) + 20.0f) / sprdist; + const float f_xdiff = (spr->x1 - gl_viewx); + const float f_ydiff = (spr->z1 - gl_viewy); + const float f_zdiff = (spr->gzt - gl_viewz); + + const float sprdist = sqrtf((f_xdiff*f_xdiff) + (f_ydiff*f_ydiff) + (f_zdiff*f_zdiff)); + const float distfact = ((2.0f * spr->dispoffset) + 20.0f) / sprdist; for (size_t i = 0; i < 4; i++) { From 51adf8869c8a3dd414ffa869d20415ab5a4f6ab5 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 2 Nov 2026 14:58:40 +0100 Subject: [PATCH 23/25] HWR_PrecacheLevelTextures should also skip texture number 0 whoopsie --- src/hardware/hw_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index 95e5d7822..3b7704cee 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -752,7 +752,7 @@ static void HWR_PrecacheLevelTextures(void) { const INT32 texnum = sidetex[f]; - if (texnum < 0 || (unsigned)texnum >= gl_numtextures) + if (texnum <= 0 || (unsigned)texnum >= gl_numtextures) continue; if (!(texturepresent[texnum] & 1)) From 9682ab59c9beed3a08277d1f3dc557597085f570 Mon Sep 17 00:00:00 2001 From: Indev Date: Tue, 3 Nov 2026 23:56:22 +0300 Subject: [PATCH 24/25] Make M_CheckParm thread-safe, it is called from different thread in http-mserv.c for example --- src/m_argv.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/m_argv.c b/src/m_argv.c index 36c73d61c..6219b191d 100644 --- a/src/m_argv.c +++ b/src/m_argv.c @@ -13,6 +13,13 @@ #include +#ifdef HAVE_THREADS +#include +#define local_for_thread thread_local +#else +#define local_for_thread +#endif + #include "doomdef.h" #include "command.h" #include "m_argv.h" @@ -31,8 +38,11 @@ char **myargv = NULL; boolean myargmalloc = false; /** \brief founded the parm + * + * thread_local because it can potentially be used from multiple threads (global variables aaaaaa) + * (myargc and myargv don't have to be thread_local because they are never modified after being set up) */ -static INT32 found; +static local_for_thread INT32 found; /** \brief The M_CheckParm function @@ -91,7 +101,7 @@ INT32 M_CheckProtoParam(const char *check) const char *M_GetProtoParam(void) { INT32 i; - static char *string; + char *string; for (i = 1; i < myargc; i++) { From 3adcf608c3c597386d78b7d143e5b99424c54f80 Mon Sep 17 00:00:00 2001 From: Indev Date: Wed, 4 Nov 2026 01:06:18 +0300 Subject: [PATCH 25/25] (Hopefully) fix race condition in replay hut It was probably caused by menupath being modified when replay load thread is in the middle of checking it, now the check for "valid" replay load thread is simpler. Also as comment says, there still are few reported data races for replaynamesloaded but i THINK it should be fine, since the only "data race" that could be harmful here is replaynamesloaded switching from true to false, which would mean demolist_all is suddenly invalidated, and that shouldn't be possible because we only switch replaynamesloaded from true to false inside main thread while also locking the "search mutex" (this is so wordy lol) --- src/m_menu.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 06eb773b6..2c8a625ad 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3984,6 +3984,10 @@ menudemo_t *demolist = NULL; // Replays that that have been checked to match wit menudemo_t *demolist_all = NULL; // All replays size_t demolist_all_size = 0; boolean replaynamesloaded = false; +// Whenever we start a replay load thread, we increment this number and then thread will remember current value, +// and by the end it will compare it with current value, and if it is equal it means thread can store data it has loaded. +// If it's not equal, that means we started more than one thread (left and re-entered menu for example) +size_t replaythreadnum = 0; #ifdef HAVE_THREADS I_mutex replayquerymutex; @@ -4013,12 +4017,14 @@ static SINT8 replayScrollDelay = TICRATE, replayScrollDir = 1; static void ReplayNamesLoadThread(void* userdata) { + (void)userdata; + Lock_search_state(); size_t demolist_all_size_local = demolist_all_size; menudemo_t *demolist_all_local = (menudemo_t*)malloc(sizeof(menudemo_t)*demolist_all_size_local); memcpy(demolist_all_local, demolist_all, sizeof(menudemo_t)*demolist_all_size_local); - char *replaydirpath = (char*)userdata; + size_t localreplaythreadnum = replaythreadnum; Unlock_search_state(); @@ -4038,7 +4044,7 @@ static void ReplayNamesLoadThread(void* userdata) Lock_search_state(); - if (fastcmp(menupath, replaydirpath) && demolist_all) + if (replaythreadnum == localreplaythreadnum && demolist_all) { memcpy(demolist_all, demolist_all_local, sizeof(menudemo_t)*demolist_all_size); replaynamesloaded = true; @@ -4047,22 +4053,20 @@ static void ReplayNamesLoadThread(void* userdata) Unlock_search_state(); // Was allocated before thread start, we need to free it - free(replaydirpath); free(demolist_all_local); } static void LoadReplayNames(void) { - char *replaydirpath = strdup(menupath); - Lock_search_state(); + replaythreadnum++; replaynamesloaded = false; Unlock_search_state(); #ifdef HAVE_THREADS - I_spawn_thread("replay-names-load", ReplayNamesLoadThread, replaydirpath); + I_spawn_thread("replay-names-load", ReplayNamesLoadThread, NULL); #else - ReplayNamesLoadThread(replaydirpath); + ReplayNamesLoadThread(NULL); #endif } @@ -4101,8 +4105,12 @@ static void M_HutCheckReplays(size_t maxnum) // Mark as done replayqueryfound = replayquerycheck = sizedirmenu; + Lock_search_state(); + memcpy(demolist, demolist_all, sizeof(menudemo_t) * sizedirmenu); + Unlock_search_state(); + return; } @@ -4251,13 +4259,15 @@ static boolean M_HandleReplayHutQuery(INT32 choice) char tmp[MAXREPLAYQUERY+1]; memcpy(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1); - Lock_search_state(); + // Honestly not sure if locks for replaynamesloaded are necessary... + // Thread sanitizer does report race condition whenever replaynamesloaded is accessed without lock + // but really it is only ever set to false in main thread and only set to true in replay load thread, + // and both are done via locks. If replaynamesloaded is true, it is never gonna suddenly switch from true to false + // while we're in main thread, and if it would switch from false to true it is not really a big deal, we will just skip + // 1 frame where replay names were loaded + if (!replaynamesloaded) - { - Unlock_search_state(); return false; - } - Unlock_search_state(); if (M_TextInputHandle(&replayqueryinput, choice)) {