zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Manual fixes to last commit I wanted to keep separate.

Browse source
This commit is contained in:
Mitchell Richters 2022-11-16 13:50:54 +11:00 committed by Christoph Oelckers
parent a54d0f7639
commit 82e0e25b7e
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1401,7 +1401,11 @@ void DoPlayerWarpTeleporter(PLAYER* pp)
TAG 5 to 8 = random match locations
#endif
if ((act_warp = Warp(pp->posGet(), &pp->cursector)) == nullptr)
auto pos = pp->posGet();
act_warp = Warp(pos, &pp->cursector);
pp->posSet(pos);
if (act_warp == nullptr)
{
return;
}
@ -2222,7 +2226,11 @@ void DoPlayerMove(PLAYER* pp)
}
// check for warp - probably can remove from CeilingHit
if (WarpPlane(pp->posGet(), &pp->cursector))
auto pos = pp->posGet();
auto res = WarpPlane(pos, &pp->cursector);
pp->posSet(pos);
if (res)
{
PlayerWarpUpdatePos(pp);
}
@ -3498,7 +3506,11 @@ void DoPlayerClimb(PLAYER* pp)
LadderUpdate = true;
}
if (WarpPlane(pp->posGet(), &pp->cursector))
auto pos = pp->posGet();
auto res = WarpPlane(pos, &pp->cursector);
pp->posSet(pos);
if (res)
{
PlayerWarpUpdatePos(pp);
LadderUpdate = true;