From 76bb99422a8949ccd1f2e0954670ceb946722f13 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 4 Dec 2024 14:22:14 +0100 Subject: [PATCH] why does this need a variable? it just gets assigned kartstuff[k_aizdriftstrat] anyways? --- src/d_player.h | 1 - src/hardware/hw_main.c | 2 +- src/hardware/hw_md2.c | 2 +- src/k_kart.c | 4 ---- src/r_main.c | 4 ++-- src/r_things.c | 2 +- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index 09400fa9b..140a4a748 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -403,7 +403,6 @@ typedef struct player_s angle_t old_frameangle, old_frameangle2; // SRB2Kart CEP: Sliptide rolling - INT32 sliptidemem; angle_t sliproll; INT16 lturn_max[MAXPREDICTTICS]; // What's the expected turn value for full-left for a number of frames back (to account for netgame latency)? diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 02498a7b5..3c65b504f 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4703,7 +4703,7 @@ static void HWR_ProjectSprite(mobj_t *thing) { if (sliprollrotate) { - sliptiderollangle = thing->player->sliproll * (thing->player->sliptidemem); + sliptiderollangle = thing->player->sliproll * thing->player->kartstuff[k_aizdriftstrat]; pitchnroll += rollangle + FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle); } else diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index b0d5222f7..b44797976 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1382,7 +1382,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) rollfactor = ((spr->mobj->rollmodel == true) ? 1 : 0); rollang = sliptideroll - ? (spr->mobj->rollangle * rollfactor) + (sliptideroll * spr->mobj->player->sliptidemem) + ? (spr->mobj->rollangle * rollfactor) + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat]) : (spr->mobj->rollangle * rollfactor); fixed_t anglef = AngleFixed(rollang); diff --git a/src/k_kart.c b/src/k_kart.c index 847793fc9..7db6431c8 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5787,7 +5787,6 @@ static void K_KartDrift(player_t *player, boolean onground) } } - // Stop drifting if (player->kartstuff[k_spinouttimer] > 0 || player->speed < minspeed) { @@ -5796,7 +5795,6 @@ static void K_KartDrift(player_t *player, boolean onground) if (!player->sliproll) { - player->sliptidemem = 0; player->sliproll = 0; } @@ -5819,8 +5817,6 @@ static void K_KartDrift(player_t *player, boolean onground) if (player->sliproll < (32*ANG1)) player->sliproll += (4*ANG1); - - player->sliptidemem = player->kartstuff[k_aizdriftstrat]; } if (player->kartstuff[k_drift] diff --git a/src/r_main.c b/src/r_main.c index 08089ea11..abe12c86d 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -372,7 +372,7 @@ angle_t R_PlayerSliptideAngle(player_t *player) mo = player->mo; - if (mo->player->sliproll == 0 && mo->player->sliptidemem == 0) + if (mo->player->sliproll == 0 || mo->player->kartstuff[k_aizdriftstrat] == 0) return 0; size_t rot = (mo->frame & FF_FRAMEMASK); @@ -403,7 +403,7 @@ angle_t R_PlayerSliptideAngle(player_t *player) if (sprframe->rotate != SRF_SINGLE || (mo->frame & FF_PAPERSPRITE)) ang = R_PointToAngle(mo->x, mo->y) - mo->angle; - return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll * mo->player->sliptidemem); + return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll * mo->player->kartstuff[k_aizdriftstrat]); } INT32 R_GetHudUncap(void) diff --git a/src/r_things.c b/src/r_things.c index d09adb653..7af2f122b 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1383,7 +1383,7 @@ static void R_ProjectSprite(mobj_t *thing) { if (sliprollrotate) { - sliptiderollangle = thing->player->sliproll * (thing->player->sliptidemem); + sliptiderollangle = thing->player->sliproll * thing->player->kartstuff[k_aizdriftstrat]; pitchnroll += rollangle + FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle); } else