From 513e5a7e3f46460a31811bc4ae3b021fbb1692eb Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 10 Feb 2026 16:38:11 +0100 Subject: [PATCH] remove even more dead code lol --- src/d_main.c | 43 +++++++++++++++---------------------------- src/p_user.c | 3 +-- src/r_things.cpp | 3 --- src/st_stuff.c | 2 -- src/st_stuff.h | 2 -- 5 files changed, 16 insertions(+), 37 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index b0a269ae9..9d5b23f59 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -274,21 +274,17 @@ static void D_Renderview(void) R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL)); - if (rendermode == render_soft) + if (rendermode == render_soft && cv_homremoval.value) { - // if this is display player 1 - if (cv_homremoval.value) + if (cv_homremoval.value == 1) { - if (cv_homremoval.value == 1) - { - // Clear the software screen buffer to remove HOM - memset(vid.screens[0], 31, vid.width * vid.height); - } - else if (cv_homremoval.value == 2) - { - //'development' HOM removal -- makes it blindingly obvious if HOM is spotted. - memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height); - } + // Clear the software screen buffer to remove HOM + memset(vid.screens[0], 31, vid.width * vid.height); + } + else if (cv_homremoval.value == 2) + { + //'development' HOM removal -- makes it blindingly obvious if HOM is spotted. + memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height); } } @@ -322,7 +318,6 @@ static void D_Renderview(void) break; default: // Initialize for P1 viewwindowy = viewwindowx = 0; - objectsdrawn = 0; break; } @@ -333,19 +328,17 @@ static void D_Renderview(void) } else if (rendermode == render_soft) #endif + { R_RenderPlayerView(&players[displayplayers[i]]); - } - - if (rendermode == render_soft) - { - if (i == 0) - R_ApplyViewMorph(); + if (i == 0) + R_ApplyViewMorph(); #ifdef MOTIONBLUR - V_DoPostProcessor(i, postimgparam[i]); + V_DoPostProcessor(i, postimgparam[i]); #else - V_DoPostProcessor(i, 0); + V_DoPostProcessor(i, 0); #endif + } } } @@ -1645,12 +1638,6 @@ void D_SRB2Main(void) strcpy(srb2, "SRB2Kart"); D_MakeTitleString(srb2); -#if defined (__OS2__) && !defined (HAVE_SDL) - // set PM window title - snprintf(pmData->title, sizeof (pmData->title), "SRB2Kart" VERSIONSTRING ": %s", title); - pmData->title[sizeof (pmData->title) - 1] = '\0'; -#endif - if (devparm) CONS_Printf(M_GetText("Development mode ON.\n")); diff --git a/src/p_user.c b/src/p_user.c index a930ec6a1..15a71ebc8 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1822,7 +1822,6 @@ void P_DoJumpShield(player_t *player) player->pflags &= ~PF_JUMPED; //P_DoJump(player, false); - player->pflags &= ~PF_JUMPED; player->secondjump = 0; player->jumping = 0; player->pflags |= PF_THOKKED; @@ -4454,7 +4453,7 @@ static INT32 Quaketilt(player_t *player) lowb = FixedMul(lowb, player->mo->scale); moma = FixedMul(FixedDiv(delta, ANGLE_90), tilt); - speed = abs( player->mo->momx + player->mo->momy ); + speed = abs(player->mo->momx + player->mo->momy); if (speed < lowb) { diff --git a/src/r_things.cpp b/src/r_things.cpp index 58a838eea..60b0bbd52 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -1855,9 +1855,6 @@ static void R_ProjectSprite(mobj_t *thing) if (thing->subsector->sector->numlights) R_SplitSprite(vis); - - // Debug - ++objectsdrawn; } static void R_ProjectPrecipitationSprite(precipmobj_t *thing) diff --git a/src/st_stuff.c b/src/st_stuff.c index 5ca3f9d91..6dc7111f3 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -52,8 +52,6 @@ #include "r_fps.h" -UINT16 objectsdrawn = 0; - // dumb fade thing for director toggle tic_t directortoggletimer = 0; diff --git a/src/st_stuff.h b/src/st_stuff.h index 8e7f8fa41..24202646a 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -134,8 +134,6 @@ typedef enum extern hudinfo_t hudinfo[NUMHUDITEMS]; -extern UINT16 objectsdrawn; - // variable to stop mayonaka static from flickering extern consvar_t cv_lessflicker; extern consvar_t cv_stagetitle;