Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into touching_fixes

This commit is contained in:
toasterbabe 2016-12-06 21:28:33 +00:00
commit 3c8f5b4629

View file

@ -7699,6 +7699,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;