zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Replace USER sy with pos.Y calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-30 17:04:27 +11:00
parent fcf18c8c63
commit 0d70d26625
7 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
source/games/sw/src/player.cpp
View file

@ -3206,15 +3206,15 @@ void DoPlayerClimb(PLAYERp pp)
plActor->spr.pos.X = plActor->user.pos.X;
}
if (plActor->spr.pos.Y != plActor->user.sy)
if (plActor->spr.pos.Y != plActor->user.pos.Y)
{
if (plActor->spr.pos.Y < plActor->user.sy)
if (plActor->spr.pos.Y < plActor->user.pos.Y)
plActor->spr.pos.Y += ADJ_AMT;
else if (plActor->spr.pos.Y > plActor->user.sy)
else if (plActor->spr.pos.Y > plActor->user.pos.Y)
plActor->spr.pos.Y -= ADJ_AMT;
if (labs(plActor->spr.pos.Y - plActor->user.sy) <= ADJ_AMT)
plActor->spr.pos.Y = plActor->user.sy;
if (labs(plActor->spr.pos.Y - plActor->user.pos.Y) <= ADJ_AMT)
plActor->spr.pos.Y = plActor->user.pos.Y;
}
}
}
@ -4032,11 +4032,11 @@ void DoPlayerWarpToUnderwater(PLAYERp pp)
// get the offset from the sprite
plActor->user.pos.X = over_act->spr.pos.X - pp->pos.X;
plActor->user.sy = over_act->spr.pos.Y - pp->pos.Y;
plActor->user.pos.Y = over_act->spr.pos.Y - pp->pos.Y;
// update to the new x y position
pp->pos.X = under_act->spr.pos.X - plActor->user.pos.X;
pp->pos.Y = under_act->spr.pos.Y - plActor->user.sy;
pp->pos.Y = under_act->spr.pos.Y - plActor->user.pos.Y;
auto over = over_act->spr.sector();
auto under = under_act->spr.sector();
@ -4102,11 +4102,11 @@ void DoPlayerWarpToSurface(PLAYERp pp)
// get the offset from the under sprite
plActor->user.pos.X = under_act->spr.pos.X - pp->pos.X;
plActor->user.sy = under_act->spr.pos.Y - pp->pos.Y;
plActor->user.pos.Y = under_act->spr.pos.Y - pp->pos.Y;
// update to the new x y position
pp->pos.X = over_act->spr.pos.X - plActor->user.pos.X;
pp->pos.Y = over_act->spr.pos.Y - plActor->user.sy;
pp->pos.Y = over_act->spr.pos.Y - plActor->user.pos.Y;
auto over = over_act->spr.sector();
auto under = under_act->spr.sector();