From 84c39c24f90da15fe637c80ae8cce32ef96baac8 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Wed, 17 Aug 2016 00:03:09 +0100 Subject: [PATCH] Renamed leftoffset to offset, to refer to its multifaceted uses. Also, discovered another undesirable bug, but don't understand exactly what's going on so won't describe it here. --- src/r_things.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/r_things.c b/src/r_things.c index 6cb5bac6a..522171d7d 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1117,7 +1117,7 @@ static void R_ProjectSprite(mobj_t *thing) angle_t ang; fixed_t iscale; fixed_t scalestep = 0; // toast '16 - fixed_t leftoffset; + fixed_t offset; //SoM: 3/17/2000 fixed_t gz, gzt; @@ -1237,10 +1237,10 @@ static void R_ProjectSprite(mobj_t *thing) // calculate edges of the shape if (flip) - leftoffset = spritecachedinfo[lump].width-spritecachedinfo[lump].offset; + offset = spritecachedinfo[lump].width-spritecachedinfo[lump].offset; else - leftoffset = spritecachedinfo[lump].offset; - tx -= FixedMul(leftoffset, FixedMul(this_scale, ang_scale)); + offset = spritecachedinfo[lump].offset; + tx -= FixedMul(offset, FixedMul(this_scale, ang_scale)); x1 = (centerxfrac + FixedMul (tx,xscale)) >>FRACBITS; // off the right side? @@ -1260,16 +1260,16 @@ static void R_ProjectSprite(mobj_t *thing) fixed_t yscale2; INT32 range; - tr_x = thing->x + FixedMul(-leftoffset, FINECOSINE(ang>>ANGLETOFINESHIFT)) - viewx; - tr_y = thing->y + FixedMul(-leftoffset, FINESINE(ang>>ANGLETOFINESHIFT)) - viewy; + tr_x = thing->x + FixedMul(-offset, FINECOSINE(ang>>ANGLETOFINESHIFT)) - viewx; + tr_y = thing->y + FixedMul(-offset, FINESINE(ang>>ANGLETOFINESHIFT)) - viewy; gxt = FixedMul(tr_x, viewcos); gyt = -FixedMul(tr_y, viewsin); tz = gxt-gyt; yscale1 = FixedDiv(projectiony, tz); - leftoffset += spritecachedinfo[lump].width; - tr_x = thing->x + FixedMul(leftoffset, FINECOSINE(ang>>ANGLETOFINESHIFT)) - viewx; - tr_y = thing->y + FixedMul(leftoffset, FINESINE(ang>>ANGLETOFINESHIFT)) - viewy; + offset += spritecachedinfo[lump].width; + tr_x = thing->x + FixedMul(offset, FINECOSINE(ang>>ANGLETOFINESHIFT)) - viewx; + tr_y = thing->y + FixedMul(offset, FINESINE(ang>>ANGLETOFINESHIFT)) - viewy; gxt = FixedMul(tr_x, viewcos); gyt = -FixedMul(tr_y, viewsin); tz = gxt-gyt;