OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/master' into asmjit

Browse source
This commit is contained in:
Christoph Oelckers 2018-11-30 21:29:12 +01:00
commit b26b16e4b7
7 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/p_mobj.cpp
View file

@ -2189,15 +2189,27 @@ bool AActor::FloorBounceMissile (secplane_t &plane)
}
}
bool onsky;
if (plane.fC() < 0)
{ // on ceiling
if (!(BounceFlags & BOUNCE_Ceilings))
return true;
onsky = ceilingpic == skyflatnum;
}
else
{ // on floor
if (!(BounceFlags & BOUNCE_Floors))
return true;
onsky = floorpic == skyflatnum;
}
if (onsky && (BounceFlags & BOUNCE_NotOnSky))
{
Destroy();
return true;
}
// The amount of bounces is limited
@ -2762,10 +2774,7 @@ double P_XYMovement (AActor *mo, DVector2 scroll)
explode:
// explode a missile
bool onsky = false;
if (tm.ceilingline &&
tm.ceilingline->backsector &&
tm.ceilingline->backsector->GetTexture(sector_t::ceiling) == skyflatnum &&
mo->Z() >= tm.ceilingline->backsector->ceilingplane.ZatPoint(mo->PosRelative(tm.ceilingline)))
if (tm.ceilingline && tm.ceilingline->hitSkyWall(mo))
{
if (!(mo->flags3 & MF3_SKYEXPLODE))
{