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

Revert "- Duke: Maintain x/y/z velocity when falling through a portal, such as E1L1's air duct."

Browse source 
This reverts commit 1cb57a813948a494197e7df67dd6f58ae987b7db.
This commit is contained in:
Mitchell Richters 2022-10-08 14:38:21 +11:00 committed by Christoph Oelckers
parent 2c966e35ae
commit 641b22addf
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/games/duke/src/actors_d.cpp
View file

@ -1367,10 +1367,14 @@ void movetransports_d(void)
if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP))) || if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP))) ||
(ps[p].jetpack_on && PlayerInput(p, SB_CROUCH))) (ps[p].jetpack_on && PlayerInput(p, SB_CROUCH)))
{ {
ps[p].opos -= ps[p].pos; ps[p].pos.X += Owner->spr.pos.X - act->spr.pos.X;
ps[p].pos.XY() += Owner->spr.pos.XY() - act->spr.pos.XY(); ps[p].pos.Y += Owner->spr.pos.Y - act->spr.pos.Y;
ps[p].pos.Z = Owner->spr.pos.Z - (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11) ? 24 : -24); ps[p].backupxy();
ps[p].opos += ps[p].pos;
if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11))
ps[p].pos.Z = Owner->spr.pos.Z - 24;
else ps[p].pos.Z = Owner->spr.pos.Z + 24;
ps[p].backupz();
auto pa = ps[p].GetActor(); auto pa = ps[p].GetActor();
pa->opos = ps[p].pos; pa->opos = ps[p].pos;