Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again
This commit is contained in:
commit
1bd963db7a
|
@ -5380,7 +5380,6 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
||||||
I_Error("sprframes NULL for sprite %d\n", thing->sprite);
|
I_Error("sprframes NULL for sprite %d\n", thing->sprite);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (sprframe->rotate != SRF_SINGLE)
|
|
||||||
ang = R_PointToAngle (thing->x, thing->y) - mobjangle;
|
ang = R_PointToAngle (thing->x, thing->y) - mobjangle;
|
||||||
|
|
||||||
if (sprframe->rotate == SRF_SINGLE)
|
if (sprframe->rotate == SRF_SINGLE)
|
||||||
|
@ -5390,7 +5389,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
||||||
lumpoff = sprframe->lumpid[0]; //Fab: see note above
|
lumpoff = sprframe->lumpid[0]; //Fab: see note above
|
||||||
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
||||||
|
|
||||||
if (papersprite && (R_PointToAngle (thing->x, thing->y) - mobjangle < ANGLE_180))
|
if (papersprite && ang < ANGLE_180)
|
||||||
{
|
{
|
||||||
if (flip)
|
if (flip)
|
||||||
flip = 0;
|
flip = 0;
|
||||||
|
@ -5411,24 +5410,24 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
||||||
//Fab: lumpid is the index for spritewidth,spriteoffset... tables
|
//Fab: lumpid is the index for spritewidth,spriteoffset... tables
|
||||||
lumpoff = sprframe->lumpid[rot];
|
lumpoff = sprframe->lumpid[rot];
|
||||||
flip = sprframe->flip & (1<<rot);
|
flip = sprframe->flip & (1<<rot);
|
||||||
|
|
||||||
|
if (papersprite && ang < ANGLE_180)
|
||||||
|
{
|
||||||
|
if (flip)
|
||||||
|
flip = 0;
|
||||||
|
else
|
||||||
|
flip = 1<<rot;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
|
if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
|
||||||
this_scale = this_scale * FIXED_TO_FLOAT(((skin_t *)thing->skin)->highresscale);
|
this_scale = this_scale * FIXED_TO_FLOAT(((skin_t *)thing->skin)->highresscale);
|
||||||
|
|
||||||
if (papersprite)
|
if (papersprite)
|
||||||
{
|
|
||||||
if (flip && sprframe->rotate != SRF_SINGLE)
|
|
||||||
{
|
|
||||||
rightsin = FIXED_TO_FLOAT(FINESINE((mobjangle+ANGLE_180)>>ANGLETOFINESHIFT));
|
|
||||||
rightcos = FIXED_TO_FLOAT(FINECOSINE((mobjangle+ANGLE_180)>>ANGLETOFINESHIFT));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
rightsin = FIXED_TO_FLOAT(FINESINE((mobjangle)>>ANGLETOFINESHIFT));
|
rightsin = FIXED_TO_FLOAT(FINESINE((mobjangle)>>ANGLETOFINESHIFT));
|
||||||
rightcos = FIXED_TO_FLOAT(FINECOSINE((mobjangle)>>ANGLETOFINESHIFT));
|
rightcos = FIXED_TO_FLOAT(FINECOSINE((mobjangle)>>ANGLETOFINESHIFT));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
rightsin = FIXED_TO_FLOAT(FINESINE((viewangle + ANGLE_90)>>ANGLETOFINESHIFT));
|
rightsin = FIXED_TO_FLOAT(FINESINE((viewangle + ANGLE_90)>>ANGLETOFINESHIFT));
|
||||||
|
|
Loading…
Reference in a new issue