stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 23:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'last-min-cleanup' into 'master'

Browse source 
Last min cleanup

See merge request STJr/SRB2!342
This commit is contained in:
Monster Iestyn 2018-11-25 10:14:34 -05:00
commit 8b4a64ac05
1 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/p_map.c
View file

@ -1700,18 +1700,6 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
return true;
}
//
// CheckMissileImpact
//
static void CheckMissileImpact(mobj_t *mobj)
{
if (!(mobj->flags & MF_MISSILE) || !mobj->target)
return;
if (!mobj->target->player)
return;
}
// The highest the camera will "step up" onto another floor.
#define MAXCAMERASTEPMOVE MAXSTEPMOVE
@ -1932,11 +1920,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
}
if (!P_CheckPosition(thing, tryx, tryy))
{
if (!P_MobjWasRemoved(thing))
CheckMissileImpact(thing);
return false; // solid wall or thing
}
if (!(thing->flags & MF_NOCLIP))
{
@ -1962,7 +1946,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (tmceilingz - tmfloorz < thing->height)
{
CheckMissileImpact(thing);
if (tmfloorthing)
tmhitthing = tmfloorthing;
return false; // doesn't fit
@ -1973,16 +1956,10 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (thing->eflags & MFE_VERTICALFLIP)
{
if (thing->z < tmfloorz)
{
CheckMissileImpact(thing);
return false; // mobj must raise itself to fit
}
}
else if (tmceilingz < thingtop)
{
CheckMissileImpact(thing);
return false; // mobj must lower itself to fit
}
// Ramp test
if (maxstep > 0 && !(
@ -2030,7 +2007,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
{
if (thingtop - tmceilingz > maxstep)
{
CheckMissileImpact(thing);
if (tmfloorthing)
tmhitthing = tmfloorthing;
return false; // too big a step up
@ -2038,18 +2014,11 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
}
else if (tmfloorz - thing->z > maxstep)
{
CheckMissileImpact(thing);
if (tmfloorthing)
tmhitthing = tmfloorthing;
return false; // too big a step up
}
if (tmfloorz > thing->z)
{
if (thing->flags & MF_MISSILE)
CheckMissileImpact(thing);
}
if (!allowdropoff && !(thing->flags & MF_FLOAT) && thing->type != MT_SKIM && !tmfloorthing)
{
if (thing->eflags & MFE_VERTICALFLIP)