stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-25 21:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

players should never be missiles, nor koopa shells, nor vultures, nor penguinators..., nor tumbleweed... right?

Browse source
This commit is contained in:
Nev3r 2020-08-15 11:45:09 +02:00
parent a7130372e8
commit 9a19ca8386
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/p_mobj.c
View file

@ -2072,13 +2072,6 @@ void P_XYMovement(mobj_t *mo)
if (mo->flags & MF_NOCLIPHEIGHT) if (mo->flags & MF_NOCLIPHEIGHT)
return; // no frictions for objects that can pass through floors return; // no frictions for objects that can pass through floors
if (mo->flags & MF_MISSILE || mo->flags2 & MF2_SKULLFLY || mo->type == MT_SHELL || mo->type == MT_VULTURE || mo->type == MT_PENGUINATOR)
return; // no friction for missiles ever
if ((mo->type == MT_BIGTUMBLEWEED || mo->type == MT_LITTLETUMBLEWEED)
&& (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8)) // Special exception for tumbleweeds on slopes
return;
if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z > mo->floorz) || (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height < mo->ceilingz)) if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z > mo->floorz) || (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height < mo->ceilingz))
return; // no friction when airborne return; // no friction when airborne
@ -2094,7 +2087,16 @@ void P_XYMovement(mobj_t *mo)
P_XYFriction(mo, oldx, oldy); P_XYFriction(mo, oldx, oldy);
} }
else else
{
if (mo->flags & MF_MISSILE || mo->flags2 & MF2_SKULLFLY || mo->type == MT_SHELL || mo->type == MT_VULTURE || mo->type == MT_PENGUINATOR)
return; // no friction for missiles ever
if ((mo->type == MT_BIGTUMBLEWEED || mo->type == MT_LITTLETUMBLEWEED)
&& (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8)) // Special exception for tumbleweeds on slopes
return;
P_SceneryXYFriction(mo, oldx, oldy); P_SceneryXYFriction(mo, oldx, oldy);
}
} }
void P_RingXYMovement(mobj_t *mo) void P_RingXYMovement(mobj_t *mo)