teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-25 13:31:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Add inertia correction to PlayerWarpUpdatePos().

Browse source 
* Warping between sectors such as the clouds in $volcano now maintains perfect velocity, etc.
This commit is contained in:
Mitchell Richters 2023-01-02 11:53:10 +11:00
parent ac13bd81af
commit f431d51c2f
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,7 @@ void DoPlayerDeathExplode(PLAYER* pp);
void DoPlayerDeathFall(PLAYER* pp);
void PlayerCheckValidMove(PLAYER* pp);
void PlayerWarpUpdatePos(PLAYER* pp);
void PlayerWarpUpdatePos(PLAYER* pp, const DVector3& oldpos);
void DoPlayerBeginDiveNoWarp(PLAYER* pp);
int PlayerCanDiveNoWarp(PLAYER* pp);
void DoPlayerCurrent(PLAYER* pp);
@ -2140,12 +2140,15 @@ void DoPlayerMove(PLAYER* pp)
}
// check for warp - probably can remove from CeilingHit
const auto oldpos = actor->spr.pos;
if (WarpPlane(actor->spr.pos, &pp->cursector, actor->getOffsetZ()))
{
PlayerWarpUpdatePos(pp);
PlayerWarpUpdatePos(pp, oldpos);
}
else
{
DoPlayerZrange(pp);
}
DoPlayerZrange(pp);
//PlayerSectorBound(pp, 1);
@ -3405,9 +3408,10 @@ void DoPlayerClimb(PLAYER* pp)
LadderUpdate = true;
}
const auto oldpos = pp->actor->spr.pos;
if (WarpPlane(pp->actor->spr.pos, &pp->cursector, pp->actor->getOffsetZ()))
{
PlayerWarpUpdatePos(pp);
PlayerWarpUpdatePos(pp, oldpos);
LadderUpdate = true;
}
@ -3655,12 +3659,12 @@ void DoPlayerBeginFly(PLAYER* pp)
//
//---------------------------------------------------------------------------
void PlayerWarpUpdatePos(PLAYER* pp)
void PlayerWarpUpdatePos(PLAYER* pp, const DVector3& oldpos)
{
if (Prediction)
return;
pp->actor->backuppos();
pp->actor->opos += pp->actor->spr.pos - oldpos;
DoPlayerZrange(pp);
UpdatePlayerSprite(pp);
}