teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-01 05:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- messy ladder stuff.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-21 10:27:35 +02:00
parent 17d5242958
commit df2f68efc1
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3183,30 +3183,29 @@ void DoPlayerClimb(PLAYER* pp)
pp->pos.XY() = ppos;
// sprite
const int IADJ_AMT = 8;
auto pos = plActor->int_pos();
if (pos.X != plActor->user.int_upos().X)
ppos = plActor->spr.pos.XY();
if (ppos.X != plActor->user.pos.X)
{
if (pos.X < plActor->user.int_upos().X)
pos.X += IADJ_AMT;
else if (pos.X > plActor->user.int_upos().X)
pos.X -= IADJ_AMT;
if (ppos.X < plActor->user.pos.X)
ppos.X += ADJ_AMT;
else if (ppos.X > plActor->user.pos.X)
ppos.X -= ADJ_AMT;
if (labs(pos.X - plActor->user.int_upos().X) <= IADJ_AMT)
pos.X = plActor->user.int_upos().X;
if (abs(ppos.X - plActor->user.pos.X) <= ADJ_AMT)
ppos.X = plActor->user.pos.X;
}
if (pos.Y != plActor->user.int_upos().Y)
if (ppos.Y != plActor->user.pos.Y)
{
if (pos.Y < plActor->user.int_upos().Y)
pos.Y += IADJ_AMT;
else if (pos.Y > plActor->user.int_upos().Y)
pos.Y -= IADJ_AMT;
if (ppos.Y < plActor->user.pos.Y)
ppos.Y += ADJ_AMT;
else if (ppos.Y > plActor->user.pos.Y)
ppos.Y -= ADJ_AMT;
if (labs(pos.Y - plActor->user.int_upos().Y) <= IADJ_AMT)
pos.Y = plActor->user.int_upos().Y;
if (abs(ppos.Y - plActor->user.pos.Y) <= ADJ_AMT)
ppos.Y = plActor->user.pos.Y;
}
plActor->set_int_pos(pos);
plActor->spr.pos.XY() = ppos;
}
}