stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-23 17:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

r_fps.c ceiling_y/xoffs renamed

Browse source
This commit is contained in:
Ace Lite 2022-11-25 23:06:07 +00:00
parent 3217984f55
commit c5daa248d1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/r_fps.c
View file

@ -421,8 +421,8 @@ void R_CreateInterpolator_SectorScroll(thinker_t *thinker, sector_t *sector, boo
interp->sectorscroll.ceiling = ceiling; interp->sectorscroll.ceiling = ceiling;
if (ceiling) if (ceiling)
{ {
interp->sectorscroll.oldxoffs = interp->sectorscroll.bakxoffs = sector->ceiling_xoffs; interp->sectorscroll.oldxoffs = interp->sectorscroll.bakxoffs = sector->ceilingxoffset;
interp->sectorscroll.oldyoffs = interp->sectorscroll.bakyoffs = sector->ceiling_yoffs; interp->sectorscroll.oldyoffs = interp->sectorscroll.bakyoffs = sector->ceilingyoffset;
} }
else else
{ {
@ -490,9 +490,9 @@ static void UpdateLevelInterpolatorState(levelinterpolator_t *interp)
break; break;
case LVLINTERP_SectorScroll: case LVLINTERP_SectorScroll:
interp->sectorscroll.oldxoffs = interp->sectorscroll.bakxoffs; interp->sectorscroll.oldxoffs = interp->sectorscroll.bakxoffs;
interp->sectorscroll.bakxoffs = interp->sectorscroll.ceiling ? interp->sectorscroll.sector->ceiling_xoffs : interp->sectorscroll.sector->floorxoffset; interp->sectorscroll.bakxoffs = interp->sectorscroll.ceiling ? interp->sectorscroll.sector->ceilingxoffset : interp->sectorscroll.sector->floorxoffset;
interp->sectorscroll.oldyoffs = interp->sectorscroll.bakyoffs; interp->sectorscroll.oldyoffs = interp->sectorscroll.bakyoffs;
interp->sectorscroll.bakyoffs = interp->sectorscroll.ceiling ? interp->sectorscroll.sector->ceiling_yoffs : interp->sectorscroll.sector->flooryoffset; interp->sectorscroll.bakyoffs = interp->sectorscroll.ceiling ? interp->sectorscroll.sector->ceilingyoffset : interp->sectorscroll.sector->flooryoffset;
break; break;
case LVLINTERP_SideScroll: case LVLINTERP_SideScroll:
interp->sidescroll.oldtextureoffset = interp->sidescroll.baktextureoffset; interp->sidescroll.oldtextureoffset = interp->sidescroll.baktextureoffset;
@ -578,8 +578,8 @@ void R_ApplyLevelInterpolators(fixed_t frac)
case LVLINTERP_SectorScroll: case LVLINTERP_SectorScroll:
if (interp->sectorscroll.ceiling) if (interp->sectorscroll.ceiling)
{ {
interp->sectorscroll.sector->ceiling_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac); interp->sectorscroll.sector->ceilingxoffset = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac);
interp->sectorscroll.sector->ceiling_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac); interp->sectorscroll.sector->ceilingyoffset = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac);
} }
else else
{ {
@ -633,8 +633,8 @@ void R_RestoreLevelInterpolators(void)
case LVLINTERP_SectorScroll: case LVLINTERP_SectorScroll:
if (interp->sectorscroll.ceiling) if (interp->sectorscroll.ceiling)
{ {
interp->sectorscroll.sector->ceiling_xoffs = interp->sectorscroll.bakxoffs; interp->sectorscroll.sector->ceilingxoffset = interp->sectorscroll.bakxoffs;
interp->sectorscroll.sector->ceiling_yoffs = interp->sectorscroll.bakyoffs; interp->sectorscroll.sector->ceilingyoffset = interp->sectorscroll.bakyoffs;
} }
else else
{ {