mirror of
https://github.com/ZDoom/Raze.git
synced 2025-01-19 15:11:04 +00:00
- SW: Ladder fixes where centering of player was effectively occurring twice.
This commit is contained in:
parent
7624f8b77d
commit
f18512e270
1 changed files with 1 additions and 26 deletions
|
@ -3342,7 +3342,7 @@ void DoPlayerClimb(PLAYER* pp)
|
||||||
{
|
{
|
||||||
const double ADJ_AMT = 0.5;
|
const double ADJ_AMT = 0.5;
|
||||||
|
|
||||||
auto ppos = pp->posXY();
|
auto ppos = plActor->spr.pos.XY();
|
||||||
// player
|
// player
|
||||||
if (ppos.X != pp->LadderPosition.X)
|
if (ppos.X != pp->LadderPosition.X)
|
||||||
{
|
{
|
||||||
|
@ -3365,31 +3365,6 @@ void DoPlayerClimb(PLAYER* pp)
|
||||||
if (fabs(ppos.Y - pp->LadderPosition.Y) <= ADJ_AMT)
|
if (fabs(ppos.Y - pp->LadderPosition.Y) <= ADJ_AMT)
|
||||||
ppos.Y = pp->LadderPosition.Y;
|
ppos.Y = pp->LadderPosition.Y;
|
||||||
}
|
}
|
||||||
pp->posXY() = ppos;
|
|
||||||
|
|
||||||
// sprite
|
|
||||||
ppos = plActor->spr.pos.XY();
|
|
||||||
if (ppos.X != plActor->user.pos.X)
|
|
||||||
{
|
|
||||||
if (ppos.X < plActor->user.pos.X)
|
|
||||||
ppos.X += ADJ_AMT;
|
|
||||||
else if (ppos.X > plActor->user.pos.X)
|
|
||||||
ppos.X -= ADJ_AMT;
|
|
||||||
|
|
||||||
if (abs(ppos.X - plActor->user.pos.X) <= ADJ_AMT)
|
|
||||||
ppos.X = plActor->user.pos.X;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ppos.Y != plActor->user.pos.Y)
|
|
||||||
{
|
|
||||||
if (ppos.Y < plActor->user.pos.Y)
|
|
||||||
ppos.Y += ADJ_AMT;
|
|
||||||
else if (ppos.Y > plActor->user.pos.Y)
|
|
||||||
ppos.Y -= ADJ_AMT;
|
|
||||||
|
|
||||||
if (abs(ppos.Y - plActor->user.pos.Y) <= ADJ_AMT)
|
|
||||||
ppos.Y = plActor->user.pos.Y;
|
|
||||||
}
|
|
||||||
plActor->spr.pos.XY() = ppos;
|
plActor->spr.pos.XY() = ppos;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue