zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

This is a better version of r7468

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7469 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-03-30 20:57:56 +00:00 committed by Christoph Oelckers
parent 3926ae2d4f
commit b7160bf27c
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/duke3d/src/player.cpp
View file

@ -4498,20 +4498,11 @@ static void P_DoWater(int const playerNum, int const playerBits, int const floor
pPlayer->vel.z = 0; pPlayer->vel.z = 0;
} }
int spriteNum; if ((pPlayer->on_warping_sector == 0 || ceilZ != pPlayer->truecz) && pPlayer->pos.z < ceilZ + PMINHEIGHT)
for (SPRITES_OF_SECT(pPlayer->cursectnum, spriteNum))
if (sprite[spriteNum].statnum == STAT_TRANSPORT)
break;
if (spriteNum == -1)
{
if (pPlayer->pos.z < ceilZ + PMINHEIGHT)
{ {
pPlayer->pos.z = ceilZ + PMINHEIGHT; pPlayer->pos.z = ceilZ + PMINHEIGHT;
pPlayer->vel.z = 0; pPlayer->vel.z = 0;
} }
}
if (pPlayer->scuba_on && (krand()&255) < 8) if (pPlayer->scuba_on && (krand()&255) < 8)
{ {
@ -5120,8 +5111,6 @@ void P_ProcessInput(int playerNum)
} }
} }
pPlayer->on_warping_sector = 0;
if (TEST_SYNC_KEY(playerBits, SK_CROUCH)) if (TEST_SYNC_KEY(playerBits, SK_CROUCH))
{ {
// crouching // crouching
@ -5437,6 +5426,8 @@ HORIZONLY:;
A_PlaySound(DUKE_ONWATER, pPlayer->i); A_PlaySound(DUKE_ONWATER, pPlayer->i);
#endif #endif
pPlayer->on_warping_sector = 0;
if (pPlayer->cursectnum >= 0 && ud.noclip == 0) if (pPlayer->cursectnum >= 0 && ud.noclip == 0)
{ {
int const squishPlayer = (pushmove((vec3_t *)pPlayer, &pPlayer->cursectnum, pPlayer->clipdist, (4L << 8), stepHeight, CLIPMASK0) < 0 && int const squishPlayer = (pushmove((vec3_t *)pPlayer, &pPlayer->cursectnum, pPlayer->clipdist, (4L << 8), stepHeight, CLIPMASK0) < 0 &&