lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Renamed leftoffset to offset, to refer to its multifaceted uses.

Browse source 
Also, discovered another undesirable bug, but don't understand exactly what's going on so won't describe it here.
This commit is contained in:
toasterbabe 2016-08-17 00:03:09 +01:00
parent 10a8682620
commit 84c39c24f9
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/r_things.c
View file

@ -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;