mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-13 07:58:04 +00:00
sw/src/track.cpp:MovePlayer: Missed this in preceding interpolation fixes
This commit is contained in:
parent
1d1aa4581b
commit
fd6df8e509
1 changed files with 11 additions and 8 deletions
|
@ -1663,14 +1663,13 @@ MovePlayer(PLAYERp pp, SECTOR_OBJECTp sop, int nx, int ny)
|
||||||
pp->posx += BOUND_4PIX(nx);
|
pp->posx += BOUND_4PIX(nx);
|
||||||
pp->posy += BOUND_4PIX(ny);
|
pp->posy += BOUND_4PIX(ny);
|
||||||
|
|
||||||
if (!InterpolateSectObj)
|
|
||||||
{
|
|
||||||
pp->oposx = pp->posx;
|
|
||||||
pp->oposy = pp->posy;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TEST(sop->flags, SOBJ_DONT_ROTATE))
|
if (TEST(sop->flags, SOBJ_DONT_ROTATE))
|
||||||
{
|
{
|
||||||
|
if (!InterpolateSectObj)
|
||||||
|
{
|
||||||
|
pp->oposx = pp->posx;
|
||||||
|
pp->oposy = pp->posy;
|
||||||
|
}
|
||||||
UpdatePlayerSprite(pp);
|
UpdatePlayerSprite(pp);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1713,9 +1712,13 @@ MovePlayer(PLAYERp pp, SECTOR_OBJECTp sop, int nx, int ny)
|
||||||
// New angle is formed by taking last known angle and
|
// New angle is formed by taking last known angle and
|
||||||
// adjusting by the delta angle
|
// adjusting by the delta angle
|
||||||
pp->q16ang = fix16_from_int(NORM_ANGLE(pp->RevolveAng + pp->RevolveDeltaAng));
|
pp->q16ang = fix16_from_int(NORM_ANGLE(pp->RevolveAng + pp->RevolveDeltaAng));
|
||||||
if (!InterpolateSectObj)
|
|
||||||
pp->oq16ang = pp->q16ang;
|
|
||||||
|
|
||||||
|
if (!InterpolateSectObj)
|
||||||
|
{
|
||||||
|
pp->oq16ang = pp->q16ang;
|
||||||
|
pp->oposx = pp->posx;
|
||||||
|
pp->oposy = pp->posy;
|
||||||
|
}
|
||||||
UpdatePlayerSprite(pp);
|
UpdatePlayerSprite(pp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue