Skip to content

Commit

Permalink
Duke3D: Change from eduke32 master that didn't get cherrypicked for s…
Browse files Browse the repository at this point in the history
…ome reason
  • Loading branch information
dibollinger committed Oct 7, 2023
1 parent f82150d commit e0a5c9a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions source/duke3d/src/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4993,7 +4993,6 @@ static void P_ClampZ(DukePlayer_t* const pPlayer, int const sectorLotag, int32_t
pPlayer->pos.z = floorZ - PMINHEIGHT;
}


#define GETZRANGECLIPDISTOFFSET 16

void P_ProcessInput(int playerNum)
Expand Down Expand Up @@ -5094,7 +5093,8 @@ void P_ProcessInput(int playerNum)
if ((lowZhit & 49152) == 16384 && sectorLotag == 1 && trueFloorDist > pPlayer->spritezoffset + ZOFFSET2)
sectorLotag = 0;

if ((highZhit & 49152) == 49152)
#ifndef EDUKE32_STANDALONE
if (!FURY && (highZhit & 49152) == 49152)
{
int const spriteNum = highZhit & (MAXSPRITES-1);
int pHeightOffset = (FURY) ? PMINHEIGHT : 0;
Expand All @@ -5106,6 +5106,7 @@ void P_ProcessInput(int playerNum)
ceilZ = pPlayer->truecz;
}
}
#endif

actor[pPlayer->i].floorz = floorZ;
actor[pPlayer->i].ceilingz = ceilZ;
Expand Down

0 comments on commit e0a5c9a

Please sign in to comment.