diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index bba811dc8..44415d486 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4578,8 +4578,8 @@ static void HWR_ProjectSprite(mobj_t *thing) #ifdef ROTSPRITE // determine here if sprite should rotate for optimization - const boolean sliprollrotate = (cv_sloperoll.value && cv_sliptideroll.value && (thing->player && thing->player->sliproll)); - const boolean shouldrotate = (cv_sloperoll.value && (interp.roll || interp.pitch || interp.sloperoll || interp.slopepitch || thing->rollangle || sliprollrotate)); + const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll)); + const boolean shouldrotate = (interp.roll || interp.pitch || interp.sloperoll || interp.slopepitch || thing->rollangle || sliprollrotate); #endif //Fab : 02-08-98: 'skin' override spritedef currently used for skin diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 7eaa698f7..cf934d725 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1381,7 +1381,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) p.angley = FIXED_TO_FLOAT(anglef); } - const angle_t sliptideroll = ((cv_sloperoll.value && cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0); + const angle_t sliptideroll = ((cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0); const SINT8 flipfactor = flip ? -1 : 1; if (spr->mobj->rollangle || sliptideroll) diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index 7d5d03a80..ccafd59aa 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -401,17 +401,10 @@ static int libd_cachePatch(lua_State *L) static int libd_cachePatchRotated(lua_State *L) { HUDONLY - if (cv_sloperoll.value) - { - angle_t rollangle = luaL_checkangle(L, 2); - INT32 rot = R_GetRollAngle(rollangle); + angle_t rollangle = luaL_checkangle(L, 2); + INT32 rot = R_GetRollAngle(rollangle); + LUA_PushUserdata(L, W_CachePatchNameRotated(luaL_checkstring(L, 1), rot, PU_STATIC), META_PATCH); - LUA_PushUserdata(L, W_CachePatchNameRotated(luaL_checkstring(L, 1), rot, PU_STATIC), META_PATCH); - } - else - { - LUA_PushUserdata(L, W_CachePatchName(luaL_checkstring(L, 1), PU_STATIC), META_PATCH); - } return 1; } #endif @@ -508,12 +501,13 @@ static int libd_getSpritePatch(lua_State *L) angle = (angle & 7); // modulus angle by 8 // rotsprite????? - if (lua_isnumber(L, 4) && cv_sloperoll.value) + if (lua_isnumber(L, 4)) { angle_t rollangle = luaL_checkangle(L, 4); INT32 rot = R_GetRollAngle(rollangle); - if (rot) { + if (rot) + { patch_t *rotsprite = Patch_GetRotatedSprite(sprframe, frame, angle, sprframe->flip & (1<mo)) + if (!cv_sliptideroll.value || !player || P_MobjWasRemoved(player->mo)) return 0; mo = player->mo; diff --git a/src/r_things.c b/src/r_things.c index 7d7538941..5f4e6810a 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1233,8 +1233,8 @@ static void R_ProjectSprite(mobj_t *thing) #ifdef ROTSPRITE // determine here if sprite should rotate for optimization - const boolean sliprollrotate = (cv_sloperoll.value && cv_sliptideroll.value && (thing->player && thing->player->sliproll)); - const boolean shouldrotate = (cv_sloperoll.value && (interp.roll || interp.pitch || interp.sloperoll || interp.slopepitch || thing->rollangle || sliprollrotate)); + const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll)); + const boolean shouldrotate = (interp.roll || interp.pitch || interp.sloperoll || interp.slopepitch || thing->rollangle || sliprollrotate); #endif //Fab : 02-08-98: 'skin' override spritedef currently used for skin