lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Partial revert.

Browse source 
This partially reverts commit a1c67e7e67.
This commit is contained in:
Yukita Mayako 2015-05-29 17:22:31 -04:00
parent a1c67e7e67
commit c16516ef0d
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dehacked.c
View file

@ -7193,7 +7193,7 @@ static const char *const MOBJFLAG2_LIST[] = {
NULL NULL
}; };
static const char *const MOBJEFLAG_LIST[8] = { static const char *const MOBJEFLAG_LIST[] = {
"ONGROUND", // The mobj stands on solid floor (not on another mobj or in air) "ONGROUND", // The mobj stands on solid floor (not on another mobj or in air)
"JUSTHITFLOOR", // The mobj just hit the floor while falling, this is cleared on next frame "JUSTHITFLOOR", // The mobj just hit the floor while falling, this is cleared on next frame
"TOUCHWATER", // The mobj stands in a sector with water, and touches the surface "TOUCHWATER", // The mobj stands in a sector with water, and touches the surface

13
src/p_mobj.c
View file

@ -1493,13 +1493,12 @@ static void P_RingZMovement(mobj_t *mo)
P_AdjustMobjFloorZ_PolyObjs(mo, mo->subsector); P_AdjustMobjFloorZ_PolyObjs(mo, mo->subsector);
// adjust height // adjust height
mo->z += mo->momz;
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo)) if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
{ {
mo->momz += mo->pmomz; mo->momz += mo->pmomz;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
mo->z += mo->momz;
// clip movement // clip movement
if (mo->z <= mo->floorz && !(mo->flags & MF_NOCLIPHEIGHT)) if (mo->z <= mo->floorz && !(mo->flags & MF_NOCLIPHEIGHT))
@ -1563,13 +1562,12 @@ static boolean P_ZMovement(mobj_t *mo)
P_AdjustMobjFloorZ_PolyObjs(mo, mo->subsector); P_AdjustMobjFloorZ_PolyObjs(mo, mo->subsector);
// adjust height // adjust height
mo->z += mo->momz;
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo)) if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
{ {
mo->momz += mo->pmomz; mo->momz += mo->pmomz;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
mo->z += mo->momz;
switch (mo->type) switch (mo->type)
{ {
@ -1989,14 +1987,14 @@ static void P_PlayerZMovement(mobj_t *mo)
} }
// adjust height // adjust height
mo->z += mo->momz;
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo)) if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
{ {
mo->momz += mo->pmomz; mo->momz += mo->pmomz;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
mo->z += mo->momz;
// Have player fall through floor? // Have player fall through floor?
if (mo->player->playerstate == PST_DEAD if (mo->player->playerstate == PST_DEAD
|| mo->player->playerstate == PST_REBORN) || mo->player->playerstate == PST_REBORN)
@ -2256,13 +2254,12 @@ static boolean P_SceneryZMovement(mobj_t *mo)
P_AdjustMobjFloorZ_PolyObjs(mo, mo->subsector); P_AdjustMobjFloorZ_PolyObjs(mo, mo->subsector);
// adjust height // adjust height
mo->z += mo->momz;
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo)) if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
{ {
mo->momz += mo->pmomz; mo->momz += mo->pmomz;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
mo->z += mo->momz;
switch (mo->type) switch (mo->type)
{ {