From f8f178e9d3d8d09717fd679fb6368421077bd898 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 29 Apr 2026 17:51:10 +0200 Subject: [PATCH] remove some branch hints in some places should really only use those for things that are basically dead but gotta be kept for compat reasons and such --- src/hardware/hw_main.cpp | 12 ++++++------ src/lua_script.c | 10 +++++----- src/p_map.c | 6 +++--- src/p_mobj.c | 35 ++++++++++++++++++++--------------- src/r_things.cpp | 14 +++++++------- 5 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index e59a2174a..d412ab520 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -4693,9 +4693,9 @@ static void HWR_ProjectSprite(mobj_t *thing) flip ^= (1<lumpid[0]; flip = sprframe->flip; // Will only be 0x00 or 0xFF - spr_width = spritecachedinfo[lumpoff].width; - spr_height = spritecachedinfo[lumpoff].height; - spr_offset = spritecachedinfo[lumpoff].offset; + spr_width = spritecachedinfo[lumpoff].width; + spr_height = spritecachedinfo[lumpoff].height; + spr_offset = spritecachedinfo[lumpoff].offset; spr_topoffset = spritecachedinfo[lumpoff].topoffset; if (flip) diff --git a/src/lua_script.c b/src/lua_script.c index 8982688a1..8e07f87e3 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -979,7 +979,7 @@ static void ArchiveExtVars(UINT8 **p, void *pointer, const char *ptype) if (!gL) { - if (fastcmp(ptype,"player")) // players must always be included, even if no vars + if (fastcmp(ptype, "player")) // players must always be included, even if no vars WRITEUINT16(*p, 0); return; } @@ -995,7 +995,7 @@ static void ArchiveExtVars(UINT8 **p, void *pointer, const char *ptype) if (!lua_istable(gL, -1)) { // no extra values table lua_pop(gL, 1); - if (fastcmp(ptype,"player")) // players must always be included, even if no vars + if (fastcmp(ptype, "player")) // players must always be included, even if no vars WRITEUINT16(*p, 0); return; } @@ -1007,13 +1007,13 @@ static void ArchiveExtVars(UINT8 **p, void *pointer, const char *ptype) // skip anything that has an empty table and isn't a player. if (i == 0) { - if (fastcmp(ptype,"player")) // always include players even if they have no extra variables + if (fastcmp(ptype, "player")) // always include players even if they have no extra variables WRITEUINT16(*p, 0); lua_pop(gL, 1); return; } - if (fastcmp(ptype,"mobj")) // mobjs must write their mobjnum as a header + if (fastcmp(ptype, "mobj")) // mobjs must write their mobjnum as a header WRITEUINT32(*p, ((mobj_t *)pointer)->mobjnum); WRITEUINT16(*p, i); @@ -1083,8 +1083,8 @@ static void ArchiveTables(UINT8 **p) CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1)); lua_pop(gL, 1); - } + lua_pop(gL, 1); WRITEUINT8(*p, ARCH_TEND); } diff --git a/src/p_map.c b/src/p_map.c index dd10e2475..a5e503062 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -189,12 +189,12 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) } if (vertispeed) - object->momz = FixedMul(vertispeed,FixedSqrt(FixedMul(vscale, spring->scale))); + object->momz = FixedMul(vertispeed, FixedSqrt(FixedMul(vscale, spring->scale))); if (horizspeed) { if (!object->player) - P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(horizspeed,FixedSqrt(FixedMul(hscale, spring->scale)))); + P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(horizspeed, FixedSqrt(FixedMul(hscale, spring->scale)))); else { fixed_t finalSpeed = FixedDiv(horizspeed, hscale); @@ -203,7 +203,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) if (pSpeed > finalSpeed) finalSpeed = pSpeed; - P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(finalSpeed,FixedSqrt(FixedMul(hscale, spring->scale)))); + P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(finalSpeed, FixedSqrt(FixedMul(hscale, spring->scale)))); } } diff --git a/src/p_mobj.c b/src/p_mobj.c index 3b512cbbb..599a9a566 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -920,6 +920,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f else // Well, that makes it easy. Just get the ceiling height return sector->ceilingheight; } + static void P_PlayerFlip(mobj_t *mo) { if (!mo->player) @@ -2474,6 +2475,7 @@ static void P_PlayerZMovement(mobj_t *mo) } goto nightsdone; } + // Get up if you fell. if ((mo->state == &states[mo->info->painstate] || mo->state == &states[S_KART_SPIN]) && mo->player->kartstuff[k_spinouttimer] == 0 && mo->player->kartstuff[k_squishedtimer] == 0) // SRB2kart @@ -2526,7 +2528,7 @@ static void P_PlayerZMovement(mobj_t *mo) polyobj_t *po = newsubsec->polyList; sector_t *polysec; - while(po) + while (po) { if (!P_MobjInsidePolyobj(po, mo) || !(po->flags & POF_SOLID)) { @@ -3470,20 +3472,23 @@ static void P_PlayerMobjThinker(mobj_t *mobj) mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN; // Zoom tube - if (UNLIKELY(mobj->tracer && mobj->tracer->type == MT_TUBEWAYPOINT)) + if (mobj->tracer) { - P_UnsetThingPosition(mobj); - mobj->x += mobj->momx; - mobj->y += mobj->momy; - mobj->z += mobj->momz; - P_SetThingPosition(mobj); - P_CheckPosition(mobj, mobj->x, mobj->y); - goto animonly; - } - else if (UNLIKELY(mobj->player->pflags & PF_MACESPIN && mobj->tracer)) - { - P_CheckPosition(mobj, mobj->x, mobj->y); - goto animonly; + if (mobj->tracer->type == MT_TUBEWAYPOINT) + { + P_UnsetThingPosition(mobj); + mobj->x += mobj->momx; + mobj->y += mobj->momy; + mobj->z += mobj->momz; + P_SetThingPosition(mobj); + P_CheckPosition(mobj, mobj->x, mobj->y); + goto animonly; + } + else if (UNLIKELY(mobj->player->pflags & PF_MACESPIN)) + { + P_CheckPosition(mobj, mobj->x, mobj->y); + goto animonly; + } } // Needed for gravity boots @@ -3499,7 +3504,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj) else P_TryMove(mobj, mobj->x, mobj->y, true); - if (LIKELY(!(netgame && mobj->player->spectator))) + if (!(netgame && mobj->player->spectator)) { // Crumbling platforms for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next) diff --git a/src/r_things.cpp b/src/r_things.cpp index 410503923..911aa56e7 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -1357,9 +1357,9 @@ static void R_ProjectSprite(mobj_t *thing) I_Assert(lump < max_spritelumps); - spr_width = spritecachedinfo[lump].width; - spr_height = spritecachedinfo[lump].height; - spr_offset = spritecachedinfo[lump].offset; + spr_width = spritecachedinfo[lump].width; + spr_height = spritecachedinfo[lump].height; + spr_offset = spritecachedinfo[lump].offset; spr_topoffset = spritecachedinfo[lump].topoffset; #ifdef ROTSPRITE @@ -1408,10 +1408,10 @@ static void R_ProjectSprite(mobj_t *thing) if (rotsprite != NULL) { - spr_width = rotsprite->width << FRACBITS; - spr_height = rotsprite->height << FRACBITS; - spr_offset = rotsprite->leftoffset << FRACBITS; - spr_topoffset = rotsprite->topoffset << FRACBITS; + spr_width = rotsprite->width << FRACBITS; + spr_height = rotsprite->height << FRACBITS; + spr_offset = rotsprite->leftoffset << FRACBITS; + spr_topoffset = rotsprite->topoffset << FRACBITS; spr_topoffset += FEETADJUST; // flip -> rotate, not rotate -> flip