From ae36202ac76818a0f004a71a21ad23f73a9704c4 Mon Sep 17 00:00:00 2001 From: terminx Date: Fri, 26 Jul 2019 23:11:20 +0000 Subject: [PATCH] Fix for emerging from TROR water git-svn-id: https://svn.eduke32.com/eduke32@7848 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/actors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index b9e7582d2..caa704de3 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -3403,7 +3403,7 @@ static int P_Submerge(int const playerNum, DukePlayer_t * const pPlayer, int con static int P_Emerge(int const playerNum, DukePlayer_t * const pPlayer, int const sectNum, int const otherSect) { // r1449-: - if (pPlayer->pos.z < (sector[sectNum].ceilingz+1080) && pPlayer->vel.z == 0) + if (pPlayer->pos.z < (sector[sectNum].ceilingz+1080) && pPlayer->vel.z <= 0) // r1450+, breaks submergible slime in bobsp2: // if (onfloorz && sectlotag == 2 && ps->pos.z <= sector[sect].ceilingz /*&& ps->vel.z == 0*/) {