From b3e3947fc0d91ceaf1df29cc8365bbcff65f31cd Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 4 Dec 2024 14:20:49 +0100 Subject: [PATCH] clean up this mess --- src/hardware/hw_md2.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 3bbbafe74..b0d5222f7 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1373,18 +1373,15 @@ void HWR_DrawMD2(gl_vissprite_t *spr) p.spritexscale = FIXED_TO_FLOAT(spr->mobj->spritexscale); p.spriteyscale = FIXED_TO_FLOAT(spr->mobj->spriteyscale); - - angle_t sliptideroll = 0; - if (spr->mobj->player) - sliptideroll = ((cv_sloperoll.value && cv_sliptideroll.value) ? spr->mobj->player->sliproll : 0); + angle_t sliptideroll = ((cv_sloperoll.value && cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0); - if ((spr->mobj->rollangle)||(sliptideroll && cv_sliptideroll.value)) + if (spr->mobj->rollangle || sliptideroll) { angle_t rollang = 0; rollfactor = ((spr->mobj->rollmodel == true) ? 1 : 0); - rollang = (spr->mobj->player && sliptideroll && cv_sliptideroll.value) + rollang = sliptideroll ? (spr->mobj->rollangle * rollfactor) + (sliptideroll * spr->mobj->player->sliptidemem) : (spr->mobj->rollangle * rollfactor);