From 6162d285c978208bbfa9df6a5049607157a4274a Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 21 Oct 2024 21:05:05 +0200 Subject: [PATCH] dont use cv_sloperolldist in splitscreen + save some assignments and one fixedhypot call also use tabs lul --- src/k_kart.c | 87 +++++++++++++++++++++++++--------------------------- src/p_mobj.c | 7 +---- 2 files changed, 42 insertions(+), 52 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 0865a7d6d..e29973957 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3334,56 +3334,55 @@ static void K_QuiteSaltyHop(player_t *p) void K_RollMobjBySlopes(mobj_t* mo, boolean usedistance) { - I_Assert(mo->subsector != NULL); - I_Assert(mo->subsector->sector != NULL); + I_Assert(mo->subsector != NULL); + I_Assert(mo->subsector->sector != NULL); - angle_t an; - boolean flip = mo->eflags & MFE_VERTICALFLIP; - fixed_t m_dist = R_PointToDist(mo->x, mo->y); - fixed_t rolldist = cv_sloperolldist.value * mapobjectscale; + angle_t an; + boolean flip = mo->eflags & MFE_VERTICALFLIP; + fixed_t m_dist = usedistance ? R_PointToDist(mo->x, mo->y) : 0; + fixed_t rolldist = cv_sloperolldist.value * mapobjectscale; - // lifted from hw_md2 - if (mo->standingslope) - { - fixed_t tempz = mo->standingslope->normal.z; - fixed_t tempy = mo->standingslope->normal.y; - fixed_t tempx = mo->standingslope->normal.x; - fixed_t tempangle = -(R_PointToAngle2( - 0, 0, FixedSqrt(FixedMul(tempy, tempy) + FixedMul(tempz, tempz)), tempx)); + // lifted from hw_md2 + if (mo->standingslope) + { + fixed_t tempz = mo->standingslope->normal.z; + fixed_t tempy = mo->standingslope->normal.y; + fixed_t tempx = mo->standingslope->normal.x; + fixed_t tempangle = -(R_PointToAngle2(0, 0, FixedSqrt(FixedMul(tempy, tempy) + FixedMul(tempz, tempz)), tempx)); - // admittedly this is a very hacky way to do the pitch and roll easing + // admittedly this is a very hacky way to do the pitch and roll easing - // pitch - if ((!usedistance) || (m_dist <= (rolldist))) - { - an = (INT32)((angle_t)tempangle - mo->pitch_sprite) / SLOPEROLL_DIV; + // pitch + if ((!usedistance) || (m_dist <= (rolldist))) + { + an = (INT32)((angle_t)tempangle - mo->pitch_sprite) / SLOPEROLL_DIV; - mo->pitch_sprite = an ? mo->pitch_sprite + an : (angle_t)tempangle; - } - else - mo->pitch_sprite = FixedAngle(0); + mo->pitch_sprite = an ? mo->pitch_sprite + an : (angle_t)tempangle; + } + else + mo->pitch_sprite = FixedAngle(0); - mo->slopepitch = flip ? InvAngle(mo->pitch_sprite) : mo->pitch_sprite; + mo->slopepitch = flip ? InvAngle(mo->pitch_sprite) : mo->pitch_sprite; - // roll - tempangle = (R_PointToAngle2(0, 0, tempz, tempy)); + // roll + tempangle = (R_PointToAngle2(0, 0, tempz, tempy)); - if ((!usedistance) || (m_dist <= (rolldist))) - { - an = (INT32)((angle_t)tempangle - mo->roll_sprite) / SLOPEROLL_DIV; + if (!usedistance || (m_dist <= (rolldist))) + { + an = (INT32)((angle_t)tempangle - mo->roll_sprite) / SLOPEROLL_DIV; - mo->roll_sprite = an ? mo->roll_sprite + an : (angle_t)tempangle; - } - else - mo->roll_sprite = FixedAngle(0); + mo->roll_sprite = an ? mo->roll_sprite + an : (angle_t)tempangle; + } + else + mo->roll_sprite = FixedAngle(0); - mo->sloperoll = flip ? InvAngle(mo->roll_sprite) : mo->roll_sprite; - } - else if (P_IsObjectOnGround(mo)) - { - mo->sloperoll = FixedAngle(0); - mo->slopepitch = FixedAngle(0); - } + mo->sloperoll = flip ? InvAngle(mo->roll_sprite) : mo->roll_sprite; + } + else if (P_IsObjectOnGround(mo)) + { + mo->sloperoll = FixedAngle(0); + mo->slopepitch = FixedAngle(0); + } } void K_SpawnBoostTrail(player_t *player) @@ -6777,14 +6776,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground) player->mo->spriteyscale = player->mo->realyscale; } - boolean usedist = false; - - if (cv_sloperolldist.value > 0) - usedist = true; - if ((cv_spriteroll.value) && (cv_sloperoll.value)) + if (cv_spriteroll.value && cv_sloperoll.value) { if ((!player->mo->salty_jump)) // seeing a character rotate mid-hop looks really janky - K_RollMobjBySlopes(player->mo, usedist); + K_RollMobjBySlopes(player->mo, (cv_sloperolldist.value && !splitscreen)); } else { diff --git a/src/p_mobj.c b/src/p_mobj.c index 3b06c3737..97db62733 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6003,17 +6003,12 @@ static void P_KoopaThinker(mobj_t *koopa) // void P_RollPitchMobj(mobj_t* mobj) { - boolean usedist = false; - if (P_MobjWasRemoved(mobj)) return; - if (cv_sloperolldist.value > 0) - usedist = true; - if (cv_spriteroll.value && cv_sloperoll.value == 2) { - K_RollMobjBySlopes(mobj, usedist); + K_RollMobjBySlopes(mobj, cv_sloperolldist.value && !splitscreen); } else {