Commit 3a640632 authored by Richard Gobeille's avatar Richard Gobeille
Browse files

This is a better version of r7468

From-SVN: r7469
parent 5240da96
......@@ -4498,19 +4498,10 @@ static void P_DoWater(int const playerNum, int const playerBits, int const floor
pPlayer->vel.z = 0;
}
int spriteNum;
for (SPRITES_OF_SECT(pPlayer->cursectnum, spriteNum))
if (sprite[spriteNum].statnum == STAT_TRANSPORT)
break;
if (spriteNum == -1)
if ((pPlayer->on_warping_sector == 0 || ceilZ != pPlayer->truecz) && pPlayer->pos.z < ceilZ + PMINHEIGHT)
{
if (pPlayer->pos.z < ceilZ + PMINHEIGHT)
{
pPlayer->pos.z = ceilZ + PMINHEIGHT;
pPlayer->vel.z = 0;
}
pPlayer->pos.z = ceilZ + PMINHEIGHT;
pPlayer->vel.z = 0;
}
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))
{
// crouching
......@@ -5437,6 +5426,8 @@ HORIZONLY:;
A_PlaySound(DUKE_ONWATER, pPlayer->i);
#endif
pPlayer->on_warping_sector = 0;
if (pPlayer->cursectnum >= 0 && ud.noclip == 0)
{
int const squishPlayer = (pushmove((vec3_t *)pPlayer, &pPlayer->cursectnum, pPlayer->clipdist, (4L << 8), stepHeight, CLIPMASK0) < 0 &&
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment