From f2a7f9ccaa541fbf074d022fe029c81999016716 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 25 Nov 2025 20:21:15 +0100 Subject: [PATCH 1/6] fix compile with HAVE_DISCORDRPC --- src/m_menudefs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/m_menudefs.c b/src/m_menudefs.c index f0d436e95..03973effc 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -2297,6 +2297,7 @@ menu_t MISC_DiscordRequestsDef = { &MPauseDef, MISC_DiscordRequestsMenu, M_DrawDiscordRequests, + NULL, 0, 0, 0, NULL, From cd32270ec00f491c6f13cb55292ab343219fcab6 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 25 Nov 2025 20:25:07 +0100 Subject: [PATCH 2/6] . W :mompie: --- src/m_menudefs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/m_menudefs.c b/src/m_menudefs.c index 03973effc..a57141b7c 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -1874,7 +1874,7 @@ static const char* OP_SaturnHudTooltips[] = "Disable the animation of the Positionnumber\nwhen overtaking someone.", "Flash current Lap Time when doing a Lap on the Timer.", "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.", + "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.", "Show the big 'LAP' text on a lap change.", "Show the big Cecho Messages.", From 0f59e0e270adea690235c1eefa072c805c0a3613 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 25 Nov 2025 21:18:26 +0100 Subject: [PATCH 3/6] some mobj interp fixes copy pasted from RR thx --- src/k_kart.c | 26 ++++++++++++++++++-------- src/p_mobj.c | 9 ++++++++- src/p_saveg.c | 14 +++++++------- src/p_telept.c | 1 + src/p_user.c | 11 +++++++---- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 0cbd11a9b..141af3481 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3978,15 +3978,19 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter) mine->floorz = thismine->floorz; mine->ceilingz = thismine->ceilingz; - //Since we aren't using P_KillMobj, we need to clean up the hnext reference - { - P_SetTarget(&thismine->target->hnext, NULL); //target is the player who owns the mine - thismine->target->player->kartstuff[k_bananadrag] = 0; - thismine->target->player->kartstuff[k_itemheld] = 0; + // Copy interp data + mine->old_angle = thismine->old_angle; + mine->old_x = thismine->old_x; + mine->old_y = thismine->old_y; + mine->old_z = thismine->old_z; - if (--thismine->target->player->kartstuff[k_itemamount] <= 0) - thismine->target->player->kartstuff[k_itemtype] = KITEM_NONE; - } + // Since we aren't using P_KillMobj, we need to clean up the hnext reference + P_SetTarget(&thismine->target->hnext, NULL); // target is the player who owns the mine + thismine->target->player->kartstuff[k_bananadrag] = 0; + thismine->target->player->kartstuff[k_itemheld] = 0; + + if (--thismine->target->player->kartstuff[k_itemamount] <= 0) + thismine->target->player->kartstuff[k_itemtype] = KITEM_NONE; P_RemoveMobj(thismine); @@ -4422,6 +4426,12 @@ void K_DropHnextList(player_t *player) dropwork->floorz = work->floorz; dropwork->ceilingz = work->ceilingz; + // Copy interp data + dropwork->old_angle = work->old_angle; + dropwork->old_x = work->old_x; + dropwork->old_y = work->old_y; + dropwork->old_z = work->old_z; + if (ponground) { // floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn diff --git a/src/p_mobj.c b/src/p_mobj.c index 14aa6af8d..78a440c6f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10668,8 +10668,9 @@ void P_SpawnPlayer(INT32 playernum) mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER); I_Assert(mobj != NULL); (mobj->player = p)->mo = mobj; + //P_SetTarget(&p->mo, mobj); - mobj->angle = 0; + mobj->angle = mobj->old_angle = 0; // set color translations for player sprites mobj->color = p->skincolor; @@ -10776,6 +10777,12 @@ void P_AfterPlayerSpawn(INT32 playernum) mobj_t *mobj = p->mo; UINT8 i; + // Update interpolation + mobj->old_x = mobj->x; + mobj->old_y = mobj->y; + mobj->old_z = mobj->z; + mobj->old_angle = mobj->angle; + for (i = 0; i <= splitscreen; i++) { if (playernum == P_GetLocalPlayerNumForNum(i)) diff --git a/src/p_saveg.c b/src/p_saveg.c index b01556413..1fb6c5aa8 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -339,7 +339,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading) for (j = 0; j < NUMKARTSTUFF; j++) player->kartstuff[j] = READINT32(save->p); - player->frameangle = READANGLE(save->p); + player->frameangle = player->old_frameangle = READANGLE(save->p); player->playerstate = READUINT8(save->p); player->pflags = READUINT32(save->p); @@ -2052,15 +2052,15 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) if (diff & MD_POS) { - mobj->x = READFIXED(save->p); - mobj->y = READFIXED(save->p); - mobj->angle = READANGLE(save->p); + mobj->x = mobj->old_x = READFIXED(save->p); + mobj->y = mobj->old_y = READFIXED(save->p); + mobj->angle = mobj->old_angle = READANGLE(save->p); } else { - mobj->x = mobj->spawnpoint->x << FRACBITS; - mobj->y = mobj->spawnpoint->y << FRACBITS; - mobj->angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT); + mobj->x = mobj->old_x = mobj->spawnpoint->x << FRACBITS; + mobj->y = mobj->old_y = mobj->spawnpoint->y << FRACBITS; + mobj->angle = mobj->old_angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT); } if (diff & MD_MOM) diff --git a/src/p_telept.c b/src/p_telept.c index 539e0050b..b7bdb0346 100644 --- a/src/p_telept.c +++ b/src/p_telept.c @@ -106,6 +106,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, P_FlashPal(thing->player, PAL_MIXUP, 10); } + thing->old_angle += (angle-thing->angle); thing->angle = angle; thing->momx = thing->momy = thing->momz = 0; diff --git a/src/p_user.c b/src/p_user.c index 943523244..e42411160 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1162,6 +1162,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_GHOST); + // not sure if this is safe to do........... + //P_SetTarget(&ghost->target, mobj); + P_SetScale(ghost, mobj->scale); ghost->scalespeed = mobj->scalespeed; ghost->destscale = mobj->scale; @@ -1175,10 +1178,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->color = mobj->color; ghost->colorized = mobj->colorized; // Kart: they should also be colorized if their origin is - if (mobj->player) - ghost->angle = mobj->player->frameangle; - else - ghost->angle = mobj->angle; + ghost->angle = (mobj->player ? mobj->player->frameangle : mobj->angle); ghost->sprite = mobj->sprite; ghost->frame = mobj->frame; @@ -1191,6 +1191,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->localskin = mobj->localskin; ghost->skinlocal = mobj->skinlocal; + // same deal... + //ghost->standingslope = mobj->standingslope; + ghost->spritexscale = mobj->spritexscale; ghost->spriteyscale = mobj->spriteyscale; ghost->spritexoffset = mobj->spritexoffset; From 86ac11f87747066539666c0233b0927d3635d02b Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 25 Nov 2025 22:49:16 +0100 Subject: [PATCH 4/6] replace localangle assignments with P_ForceLocalAngle just a little neater, there also was a function to force the player angle, but this most likely wouldve changed behavior --- src/d_clisrv.c | 4 ++- src/g_demo.c | 1 + src/g_game.h | 2 +- src/lua_mobjlib.c | 10 ++----- src/p_inter.c | 9 +----- src/p_local.h | 5 +++- src/p_map.c | 9 +----- src/p_mobj.c | 9 +----- src/p_polyobj.c | 9 ++---- src/p_saveg.c | 10 ------- src/p_spec.c | 27 +++++------------- src/p_telept.c | 13 ++------- src/p_user.c | 73 +++++++++++++++++++++++++++++++---------------- 13 files changed, 75 insertions(+), 106 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index e7010a08f..628fdefc2 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2152,7 +2152,7 @@ static void CL_ReloadReceivedSavegame(void) // we dont have P_ForceLocalAngle so were setting it manually here for (i = 0; i <= splitscreen; i++) { - localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn << 16); + P_ForceLocalAngle(&players[displayplayers[i]], (angle_t)(players[displayplayers[i]].cmd.angleturn << 16)); } for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) @@ -4525,6 +4525,8 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum) DEBFILE("spawning me\n"); } + P_ForceLocalAngle(&players[newplayernum], (angle_t)(players[newplayernum].cmd.angleturn << 16)); + D_SendPlayerConfig(); addedtogame = true; } diff --git a/src/g_demo.c b/src/g_demo.c index c670f69cd..7fff0e928 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -484,6 +484,7 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum) G_CopyTiccmd(cmd, &oldcmd[playernum], 1); + // what in the actual fuck is this??? // SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving || (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn diff --git a/src/g_game.h b/src/g_game.h index 249ecbff1..c16d02d4a 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -160,7 +160,7 @@ typedef enum const char *G_BuildMapName(INT32 map); void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer); -// copy ticcmd_t to and fro the normal way +// copy ticcmd_t to and from the normal way ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n); // copy ticcmd_t to and fro network packets ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n); diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index fef27f563..45c3a9f19 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -251,14 +251,8 @@ int mobj_angle_setter(lua_State *L) mobj_t *mo = GETMO(); mo->angle = luaL_checkangle(L, 2); - for (UINT8 i = 0; i <= splitscreen; i++) - { - if (mo->player == P_GetLocalPlayerForNum(i)) - { - localangle[i] = mo->angle; - break; - } - } + if (mo->player) + P_ForceLocalAngle(mo->player, mo->angle); return 0; } diff --git a/src/p_inter.c b/src/p_inter.c index 876ffa4b5..3518684e3 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -869,14 +869,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) toucher->angle = special->angle; - for (i = 0; i <= splitscreen; i++) - { - if (player == P_GetLocalPlayerForNum(i)) - { - localangle[i] = toucher->angle; - break; - } - } + P_ForceLocalAngle(player, toucher->angle); P_ResetPlayer(player); diff --git a/src/p_local.h b/src/p_local.h index 6977cc4b1..4d8e8032d 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -192,6 +192,7 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor); void P_ResetPlayer(player_t *player); player_t *P_GetLocalPlayerForNum(UINT8 pnum); INT32 P_GetLocalPlayerNumForNum(UINT8 pnum); +INT32 P_GetLocalPlayerNumForPlayer(const player_t *player); boolean P_IsLocalPlayer(const player_t *player); boolean P_IsLocalPlayerNum(UINT8 pnum); boolean P_IsDisplayPlayer(const player_t *player); @@ -226,7 +227,9 @@ void P_PlayerThink(player_t *player); void P_PlayerAfterThink(player_t *player); void P_DoPlayerExit(player_t *player); void P_DoTimeOver(player_t *player); -//void P_NightserizePlayer(player_t *player, INT32 ptime); + +angle_t P_GetLocalAngle(player_t *player); +void P_ForceLocalAngle(player_t *player, angle_t angle); void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move); fixed_t P_ReturnThrustX(mobj_t *mo, angle_t angle, fixed_t move); diff --git a/src/p_map.c b/src/p_map.c index f9d828b98..e51930bef 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -223,14 +223,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) if (!demo.playback || P_AnalogMove(object->player)) { - for (UINT8 j = 0; j <= splitscreen; ++j) - { - if (object->player == P_GetLocalPlayerForNum(j)) - { - localangle[j] = spring->angle; - break; - } - } + P_ForceLocalAngle(object->player, spring->angle); } } diff --git a/src/p_mobj.c b/src/p_mobj.c index 78a440c6f..fcc70ec8b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10783,14 +10783,7 @@ void P_AfterPlayerSpawn(INT32 playernum) mobj->old_z = mobj->z; mobj->old_angle = mobj->angle; - for (i = 0; i <= splitscreen; i++) - { - if (playernum == P_GetLocalPlayerNumForNum(i)) - { - localangle[i] = mobj->angle; - break; - } - } + P_ForceLocalAngle(p, mobj->angle); p->viewheight = 32<angle += delta; - for (UINT8 i = 0; i <= splitscreen; i++) + if (mo->player) { - if (mo->player == P_GetLocalPlayerForNum(i)) - { - localangle[i] += delta; - break; - } + angle_t localangle = P_GetLocalAngle(mo->player); + P_ForceLocalAngle(mo->player, localangle + delta); } } } diff --git a/src/p_saveg.c b/src/p_saveg.c index 1fb6c5aa8..0dcac2083 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -2122,16 +2122,6 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) i = READUINT8(save->p); mobj->player = &players[i]; mobj->player->mo = mobj; - - // added for angle prediction - if (consoleplayer == i) - localangle[0] = mobj->angle; - else if (displayplayers[1] == i) - localangle[1] = mobj->angle; - else if (displayplayers[2] == i) - localangle[2] = mobj->angle; - else if (displayplayers[3] == i) - localangle[3] = mobj->angle; } if (diff & MD_MOVEDIR) mobj->movedir = READANGLE(save->p); diff --git a/src/p_spec.c b/src/p_spec.c index 424e07043..c8e36176a 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -3559,14 +3559,7 @@ DoneSection2: if (!demo.playback || P_AnalogMove(player)) { - for (UINT8 j = 0; j <= splitscreen; ++j) - { - if (player == P_GetLocalPlayerForNum(j)) - { - localangle[j] = player->mo->angle; - break; - } - } + P_ForceLocalAngle(player, player->mo->angle); } if (!(lines[i].flags & ML_EFFECT4)) @@ -7517,22 +7510,16 @@ void T_Pusher(pusher_t *p) thing->player->pflags |= PF_JUMPED; thing->player->pflags |= PF_SLIDING; - thing->angle = R_PointToAngle2 (0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR)); + thing->angle = R_PointToAngle2(0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR)); if (!demo.playback || P_AnalogMove(thing->player)) { - for (UINT8 i = 0; i <= splitscreen; ++i) - { - if (thing->player == P_GetLocalPlayerForNum(i)) - { - if (thing->angle - localangle[i] > ANGLE_180) - localangle[i] -= (localangle[i] - thing->angle) / 8; - else - localangle[i] += (thing->angle - localangle[i]) / 8; + angle_t angle = P_GetLocalAngle(thing->player); - break; - } - } + if (thing->angle - angle > ANGLE_180) + P_ForceLocalAngle(thing->player, angle - (angle - thing->angle) / 8); + else + P_ForceLocalAngle(thing->player, angle + (thing->angle - angle) / 8); } } diff --git a/src/p_telept.c b/src/p_telept.c index b7bdb0346..20f53d396 100644 --- a/src/p_telept.c +++ b/src/p_telept.c @@ -65,14 +65,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, thing->reactiontime = TICRATE/2; // don't move for about half a second // absolute angle position - for (i = 0; i <= splitscreen; i++) - { - if (thing == P_GetLocalPlayerForNum(i)->mo) - { - localangle[i] = angle; - break; - } - } + P_ForceLocalAngle(thing->player, angle); // move chasecam at new player location for (i = 0; i <= splitscreen; i++) @@ -151,18 +144,18 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle thing->reactiontime = TICRATE/2; // don't move for about half a second // absolute angle position + P_ForceLocalAngle(thing->player, angle); + // move chasecam at new player location for (i = 0; i <= splitscreen; i++) { if (thing->player != &players[displayplayers[i]]) continue; - localangle[i] = angle; if (camera[i].chase) P_ResetCamera(thing->player, &camera[i]); R_ResetViewInterpolation(i + 1); - break; } // don't run in place after a teleport diff --git a/src/p_user.c b/src/p_user.c index e42411160..ffe4d0e67 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -996,6 +996,19 @@ INT32 P_GetLocalPlayerNumForNum(UINT8 pnum) return (pnum == 0 ? consoleplayer : displayplayers[pnum]); } +INT32 P_GetLocalPlayerNumForPlayer(const player_t *player) +{ + for (UINT8 i = 0; i <= splitscreen; i++) + { + if (player == P_GetLocalPlayerForNum(i)) + { + return i; + } + } + + return -1; +} + // // P_IsLocalPlayer // @@ -2603,15 +2616,7 @@ static void P_DoZoomTube(player_t *player) if (player->mo->tracer) { player->mo->angle = R_PointToAngle2(player->mo->x, player->mo->y, player->mo->tracer->x, player->mo->tracer->y); - - for (UINT8 i = 0; i <= splitscreen; i++) - { - if (player == P_GetLocalPlayerForNum(i)) - { - localangle[i] = player->mo->angle; - break; - } - } + P_ForceLocalAngle(player, player->mo->angle); } } @@ -2797,14 +2802,7 @@ void P_HomingAttack(mobj_t *source, mobj_t *enemy) // Home in on your target if (source->player) { - for (UINT8 i = 0; i <= splitscreen; i++) - { - if (source->player == P_GetLocalPlayerForNum(i)) - { - localangle[i] = source->angle; - break; - } - } + P_ForceLocalAngle(source->player, source->angle); } // change slope @@ -5200,14 +5198,8 @@ void P_PlayerAfterThink(player_t *player) player->mo->tracer->target->health += cmd->sidemove; player->mo->angle += cmd->sidemove << ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX - for (i = 0; i <= splitscreen; i++) - { - if (player == P_GetLocalPlayerForNum(i)) - { - localangle[i] = player->mo->angle; // Adjust the local control angle. - break; - } - } + // Adjust the local control angle. + P_ForceLocalAngle(player, player->mo->angle); } } @@ -5246,3 +5238,34 @@ void P_PlayerAfterThink(player_t *player) K_KartPlayerAfterThink(player); } + +angle_t P_GetLocalAngle(player_t *player) +{ + // this function is from vanilla srb2. can you tell? + // (hint: they have separate variables for all of this shit instead of arrays) + UINT8 i; + + for (i = 0; i <= splitscreen; i++) + { + if (player == &players[displayplayers[i]]) + return localangle[i]; + } + + return 0; +} + +void P_ForceLocalAngle(player_t *player, angle_t angle) +{ + UINT8 i; + + angle = angle & ~UINT16_MAX; + + for (i = 0; i <= splitscreen; i++) + { + if (player == &players[displayplayers[i]]) + { + localangle[i] = angle; + } + } +} + From d188839d0bf55d57bbde138b9e9fbf5cfb4f6380 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 26 Nov 2025 10:08:20 +0100 Subject: [PATCH 5/6] move R_QuickCamDist to r_main also mark it with PUREFUNC and R_QuickDist with FUNCMATH, so compiler may optimze it more agressively --- src/r_main.h | 20 ++++++++++++++++++++ src/r_things.h | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/r_main.h b/src/r_main.h index 04c996365..36c8756f8 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -150,6 +150,26 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y); #define R_PointToDist(x, y) R_PointToDist2(viewx, viewy, x, y) #define R_PointToDist2(px2, py2, px1, py1) FixedHypot((px1) - (px2), (py1) - (py2)) +FUNCMATH FUNCINLINE static ATTRINLINE fixed_t R_QuickDist(fixed_t x1, fixed_t y1, fixed_t x, fixed_t y) +{ + const fixed_t absx = abs(x - x1); + const fixed_t absy = abs(y - y1); +#ifdef __cplusplus + return std::max(absx, absy); +#else + return max(absx, absy); +#endif +} + +// Takes 2 fixed-point coordinates, returns "distance" between them and camera, +// as an fixed-point integer. +// It is very rough, tho it is used only for optimizing out unnecessary +// interpolation, so it is kinda ok on big distances. +FUNCINLINE static ATTRINLINE PUREFUNC fixed_t R_QuickCamDist(fixed_t x, fixed_t y) +{ + return R_QuickDist(viewx, viewy, x, y); +} + line_t *R_GetFFloorLine(const line_t *line, const ffloor_t *pfloor, const sector_t *sector); side_t *R_GetFFloorSide(const line_t *line, const ffloor_t *pfloor, const sector_t *sector); diff --git a/src/r_things.h b/src/r_things.h index b9c012b79..c8195891a 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -35,26 +35,6 @@ extern "C" { #define FEETADJUST (4<(absx, absy); -#else - return max(absx, absy); -#endif -} - -// Takes 2 fixed-point coordinates, returns "distance" between them and camera, -// as an fixed-point integer. -// It is very rough, tho it is used only for optimizing out unnecessary -// interpolation, so it is kinda ok on big distances. -FUNCINLINE static ATTRINLINE fixed_t R_QuickCamDist(fixed_t x, fixed_t y) -{ - return R_QuickDist(viewx, viewy, x, y); -} - // Constant arrays used for psprite clipping // and initializing clipping. extern INT16 *negonearray; From 04379520276ebdcf1af61a7f5091fb91c84d03d3 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 26 Nov 2025 10:08:53 +0100 Subject: [PATCH 6/6] mark checkcoord as const --- src/r_bsp.cpp | 2 +- src/r_bsp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index 5a0a21d76..e680783dd 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -500,7 +500,7 @@ clipsolid: // 0 | 0 | 1 | 2 // 1 | 4 | 5 | 6 // 2 | 8 | 9 | A -INT32 checkcoord[12][4] = +const INT32 checkcoord[12][4] = { {3, 0, 2, 1}, {3, 0, 2, 0}, diff --git a/src/r_bsp.h b/src/r_bsp.h index b9e4e291d..1d00704f7 100644 --- a/src/r_bsp.h +++ b/src/r_bsp.h @@ -34,7 +34,7 @@ extern portal_t *g_portal; // is curline a portal seg? // drawsegs are allocated on the fly... see r_segs.c -extern INT32 checkcoord[12][4]; +extern const INT32 checkcoord[12][4]; extern drawseg_t *curdrawsegs; extern drawseg_t *drawsegs;