mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-10 14:52:01 +00:00
Fix bug where "standing" on top of a sprite structure underwater would cause the player to act as if they were no longer underwater
git-svn-id: https://svn.eduke32.com/eduke32@7955 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
620f0da65b
commit
44d5371ad3
1 changed files with 2 additions and 1 deletions
|
@ -4712,6 +4712,7 @@ void P_ProcessInput(int playerNum)
|
||||||
|
|
||||||
stepHeight = max(stepHeight, 0);
|
stepHeight = max(stepHeight, 0);
|
||||||
}
|
}
|
||||||
|
else stepHeight = 0;
|
||||||
|
|
||||||
pPlayer->pos.z += stepHeight;
|
pPlayer->pos.z += stepHeight;
|
||||||
getzrange(&pPlayer->pos, pPlayer->cursectnum, &ceilZ, &highZhit, &floorZ, &lowZhit, pPlayer->clipdist - GETZRANGECLIPDISTOFFSET, CLIPMASK0);
|
getzrange(&pPlayer->pos, pPlayer->cursectnum, &ceilZ, &highZhit, &floorZ, &lowZhit, pPlayer->clipdist - GETZRANGECLIPDISTOFFSET, CLIPMASK0);
|
||||||
|
@ -4793,7 +4794,7 @@ void P_ProcessInput(int playerNum)
|
||||||
{
|
{
|
||||||
// EDuke32 extension: xvel of 1 makes a sprite be never regarded as a bridge.
|
// EDuke32 extension: xvel of 1 makes a sprite be never regarded as a bridge.
|
||||||
|
|
||||||
if ((sprite[spriteNum].xvel & 1) == 0)
|
if (sectorLotag != ST_2_UNDERWATER && (sprite[spriteNum].xvel & 1) == 0)
|
||||||
{
|
{
|
||||||
sectorLotag = 0;
|
sectorLotag = 0;
|
||||||
pPlayer->footprintcount = 0;
|
pPlayer->footprintcount = 0;
|
||||||
|
|
Loading…
Reference in a new issue