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

split "rot" into two variables: frame and rot, for frame number and rotation angle

Browse source 
it always bothered me that "rot" was used for both of the above, since it confused me as to what it was for every time I look at this function
This commit is contained in:
Monster Iestyn 2020-05-19 16:58:53 +01:00
parent dd42682791
commit c8320b6c9d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/r_things.c
View file

@ -1358,7 +1358,7 @@ static void R_ProjectSprite(mobj_t *thing)
#endif #endif
size_t lump; size_t lump;
size_t rot; size_t frame, rot;
UINT16 flip; UINT16 flip;
boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !(thing->frame & FF_VERTICALFLIP)); boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !(thing->frame & FF_VERTICALFLIP));
@ -1420,7 +1420,7 @@ static void R_ProjectSprite(mobj_t *thing)
I_Error("R_ProjectSprite: invalid sprite number %d ", thing->sprite); I_Error("R_ProjectSprite: invalid sprite number %d ", thing->sprite);
#endif #endif
rot = thing->frame&FF_FRAMEMASK; frame = thing->frame&FF_FRAMEMASK;
//Fab : 02-08-98: 'skin' override spritedef currently used for skin //Fab : 02-08-98: 'skin' override spritedef currently used for skin
if (thing->skin && thing->sprite == SPR_PLAY) if (thing->skin && thing->sprite == SPR_PLAY)
@ -1429,15 +1429,15 @@ static void R_ProjectSprite(mobj_t *thing)
#ifdef ROTSPRITE #ifdef ROTSPRITE
sprinfo = &((skin_t *)thing->skin)->sprinfo[thing->sprite2]; sprinfo = &((skin_t *)thing->skin)->sprinfo[thing->sprite2];
#endif #endif
if (rot >= sprdef->numframes) { if (frame >= sprdef->numframes) {
CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid skins[\"%s\"].sprites[%sSPR2_%s] frame %s\n"), ((skin_t *)thing->skin)->name, ((thing->sprite2 & FF_SPR2SUPER) ? "FF_SPR2SUPER|": ""), spr2names[(thing->sprite2 & ~FF_SPR2SUPER)], sizeu5(rot)); CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid skins[\"%s\"].sprites[%sSPR2_%s] frame %s\n"), ((skin_t *)thing->skin)->name, ((thing->sprite2 & FF_SPR2SUPER) ? "FF_SPR2SUPER|": ""), spr2names[(thing->sprite2 & ~FF_SPR2SUPER)], sizeu5(frame));
thing->sprite = states[S_UNKNOWN].sprite; thing->sprite = states[S_UNKNOWN].sprite;
thing->frame = states[S_UNKNOWN].frame; thing->frame = states[S_UNKNOWN].frame;
sprdef = &sprites[thing->sprite]; sprdef = &sprites[thing->sprite];
#ifdef ROTSPRITE #ifdef ROTSPRITE
sprinfo = NULL; sprinfo = NULL;
#endif #endif
rot = thing->frame&FF_FRAMEMASK; frame = thing->frame&FF_FRAMEMASK;
} }
} }
else else
@ -1447,10 +1447,10 @@ static void R_ProjectSprite(mobj_t *thing)
sprinfo = NULL; sprinfo = NULL;
#endif #endif
if (rot >= sprdef->numframes) if (frame >= sprdef->numframes)
{ {
CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid sprite frame %s/%s for %s\n"), CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid sprite frame %s/%s for %s\n"),
sizeu1(rot), sizeu2(sprdef->numframes), sprnames[thing->sprite]); sizeu1(frame), sizeu2(sprdef->numframes), sprnames[thing->sprite]);
if (thing->sprite == thing->state->sprite && thing->frame == thing->state->frame) if (thing->sprite == thing->state->sprite && thing->frame == thing->state->frame)
{ {
thing->state->sprite = states[S_UNKNOWN].sprite; thing->state->sprite = states[S_UNKNOWN].sprite;
@ -1459,11 +1459,11 @@ static void R_ProjectSprite(mobj_t *thing)
thing->sprite = states[S_UNKNOWN].sprite; thing->sprite = states[S_UNKNOWN].sprite;
thing->frame = states[S_UNKNOWN].frame; thing->frame = states[S_UNKNOWN].frame;
sprdef = &sprites[thing->sprite]; sprdef = &sprites[thing->sprite];
rot = thing->frame&FF_FRAMEMASK; frame = thing->frame&FF_FRAMEMASK;
} }
} }
sprframe = &sprdef->spriteframes[rot]; sprframe = &sprdef->spriteframes[frame];
#ifdef PARANOIA #ifdef PARANOIA
if (!sprframe) if (!sprframe)
@ -1517,7 +1517,7 @@ static void R_ProjectSprite(mobj_t *thing)
{ {
rollangle = R_GetRollAngle(thing->rollangle); rollangle = R_GetRollAngle(thing->rollangle);
if (!(sprframe->rotsprite.cached & (1<<rot))) if (!(sprframe->rotsprite.cached & (1<<rot)))
R_CacheRotSprite(thing->sprite, (thing->frame & FF_FRAMEMASK), sprinfo, sprframe, rot, flip); R_CacheRotSprite(thing->sprite, frame, sprinfo, sprframe, rot, flip);
rotsprite = sprframe->rotsprite.patch[rot][rollangle]; rotsprite = sprframe->rotsprite.patch[rot][rollangle];
if (rotsprite != NULL) if (rotsprite != NULL)
{ {