From 641b22addf43bac95dd47833d42c392152d0f5f8 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sat, 8 Oct 2022 14:38:21 +1100 Subject: [PATCH] Revert "- Duke: Maintain x/y/z velocity when falling through a portal, such as E1L1's air duct." This reverts commit 1cb57a813948a494197e7df67dd6f58ae987b7db. --- source/games/duke/src/actors_d.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 65991e13e..10eb8dd8e 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -1367,10 +1367,14 @@ void movetransports_d(void) if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP))) || (ps[p].jetpack_on && PlayerInput(p, SB_CROUCH))) { - ps[p].opos -= ps[p].pos; - ps[p].pos.XY() += Owner->spr.pos.XY() - act->spr.pos.XY(); - 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].opos += ps[p].pos; + ps[p].pos.X += Owner->spr.pos.X - act->spr.pos.X; + ps[p].pos.Y += Owner->spr.pos.Y - act->spr.pos.Y; + ps[p].backupxy(); + + 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(); pa->opos = ps[p].pos;