diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index a8c7c9301..d9f04ccea 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -6210,7 +6210,7 @@ void HWR_DoPostProcessor(player_t *player) // Armageddon Blast Flash! // Could this even be considered postprocessor? - if (player->flashcount && !cv_grpaletteshader.value || player->flashcount && cv_grpaletteshader.value && !cv_grflashpal.value) + if ((player->flashcount && !cv_grpaletteshader.value) || (player->flashcount && cv_grpaletteshader.value && !cv_grflashpal.value)) { FOutVector v[4]; FSurfaceInfo Surf; diff --git a/src/r_main.c b/src/r_main.c index 2205c4dc4..0e8fc9361 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -441,28 +441,18 @@ fixed_t R_PointToDist2(fixed_t px2, fixed_t py2, fixed_t px1, fixed_t py1) angle_t R_PlayerSliptideAngle(player_t *player) { - mobj_t *mo = player->mo; + mobj_t *mo; + spritedef_t *sprdef; + spriteframe_t *sprframe; + angle_t ang = 0; - if (!cv_sliptideroll.value || !mo || P_MobjWasRemoved(mo)) return 0; + if (!cv_sliptideroll.value || !player || P_MobjWasRemoved(player->mo)) + return 0; - size_t rot = mo->frame&FF_FRAMEMASK; - boolean papersprite = (mo->frame & FF_PAPERSPRITE); + mo = player->mo; - spritedef_t *sprdef; - spriteframe_t *sprframe; - angle_t ang = 0; - - interpmobjstate_t interp = {0}; - - // Yes. - if (R_UsingFrameInterpolation() && !paused) - { - R_InterpolateMobjState(mo, rendertimefrac, &interp); - } - else - { - R_InterpolateMobjState(mo, FRACUNIT, &interp); - } + size_t rot = mo->frame & FF_FRAMEMASK; + boolean papersprite = (mo->frame & FF_PAPERSPRITE); if (mo->skin && mo->sprite == SPR_PLAY) { @@ -488,7 +478,7 @@ angle_t R_PlayerSliptideAngle(player_t *player) if (!sprframe) return 0; if (sprframe->rotate != SRF_SINGLE || papersprite) - ang = R_PointToAngle(interp.x, interp.y) - interp.angle; + ang = R_PointToAngle(mo->x, mo->y) - mo->angle; return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll*(mo->player->sliptidemem)); } diff --git a/src/r_things.c b/src/r_things.c index e93fd9834..d6c6235ba 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -130,7 +130,7 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch { char cn = R_Frame2Char(frame); // for debugging - INT32 r, ang; + INT32 r; lumpnum_t lumppat = wad; lumppat <<= 16; lumppat += lump; @@ -828,9 +828,9 @@ static void R_DrawFlippedMaskedColumn(column_t *column, INT32 texheight) static void R_DrawVisSprite(vissprite_t *vis) { column_t *column; - void (*localcolfunc)(column_t *); +#ifdef RANGECHECK INT32 texturecolumn; - INT32 pwidth; +#endif fixed_t frac; patch_t *patch = vis->patch; fixed_t this_scale = vis->thingscale; @@ -951,7 +951,6 @@ static void R_DrawVisSprite(vissprite_t *vis) if (!(vis->scalestep)) { sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale); - //sprtopscreen += vis->shear.tan * vis->shear.offset; dc_iscale = FixedDiv(FRACUNIT, vis->scale); } @@ -1206,8 +1205,6 @@ static void R_ProjectSprite(mobj_t *thing) fixed_t scalestep; // toast '16 fixed_t offset, offset2; boolean papersprite = (thing->frame & FF_PAPERSPRITE); - fixed_t paperoffset = 0, paperdistance = 0; - angle_t centerangle = 0; //SoM: 3/17/2000 fixed_t gz, gzt; @@ -1638,8 +1635,6 @@ static void R_ProjectSprite(mobj_t *thing) vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1); } - vis->thingscale = interp.scale; - //Fab: lumppat is the lump number of the patch to use, this is different // than lumpid for sprites-in-pwad : the graphics are patched #ifdef ROTSPRITE diff --git a/src/r_things.h b/src/r_things.h index 4d246e7d8..39be3c3f1 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -136,10 +136,7 @@ typedef struct vissprite_s fixed_t thingscale; // the object's scale fixed_t sortscale; // sortscale only differs from scale for flat sprites fixed_t scalestep; // only for flat sprites, 0 otherwise - fixed_t paperoffset, paperdistance; // for paper sprites, offset/dist relative to the angle fixed_t xiscale; // negative if flipped - - angle_t centerangle; // for paper sprites fixed_t texturemid; patch_t *patch; diff --git a/src/st_stuff.c b/src/st_stuff.c index 1c7ba5190..266b554e1 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -247,7 +247,7 @@ void ST_doPaletteStuff(void) palette = min(max(palette, 0), 13); #ifdef HWRENDER - if (rendermode == render_opengl && !cv_grpaletteshader.value || rendermode == render_opengl && cv_grpaletteshader.value && !cv_grflashpal.value) + if ((rendermode == render_opengl && !cv_grpaletteshader.value) || (rendermode == render_opengl && cv_grpaletteshader.value && !cv_grflashpal.value)) palette = 0; // No flashpals here in OpenGL #endif