Merge branch 'mfe_onground-is-stupid' into 'next'

Fix ceiling springs thrusting themselves down in midair on touch

What the title says. I blame MFE_ONGROUND for being stupid, but for now I made it behave a bit better with flipped items at least.

See merge request !140
This commit is contained in:
Monster Iestyn 2016-12-06 16:22:33 -05:00
commit ac966bf790
1 changed files with 4 additions and 0 deletions

View File

@ -7685,6 +7685,10 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
if (mobj->type == MT_UNIDUS)
mobj->z -= FixedMul(mobj->info->mass, mobj->scale);
// defaults onground
if (mobj->z + mobj->height == mobj->ceilingz)
mobj->eflags |= MFE_ONGROUND;
}
else
mobj->z = z;