diff --git a/src/info.c b/src/info.c index cb00a3bff..60516c822 100644 --- a/src/info.c +++ b/src/info.c @@ -8880,8 +8880,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_SPIKED2, // xdeathstate sfx_mspogo, // deathsound 2*TICRATE, // speed - 8*FRACUNIT, // radius - 32*FRACUNIT, // height + 14*FRACUNIT, // radius + 64*FRACUNIT, // height 0, // display offset 4, // mass 0, // damage diff --git a/src/p_map.c b/src/p_map.c index a02a5191d..07dafc620 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1257,11 +1257,11 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) { if (thing->z + thing->height <= tm.thing->z + FixedMul(FRACUNIT, tm.thing->scale) && thing->z + thing->height + thing->momz >= tm.thing->z + FixedMul(FRACUNIT, tm.thing->scale) + tm.thing->momz) - P_DamageMobj(thing, tm.thing, tm.thing, 1, DMG_NORMAL); + P_DamageMobj(thing, tm.thing, tm.thing, 1, DMG_TUMBLE); } else if (thing->z >= tm.thing->z + tm.thing->height - FixedMul(FRACUNIT, tm.thing->scale) && thing->z + thing->momz <= tm.thing->z + tm.thing->height - FixedMul(FRACUNIT, tm.thing->scale) + tm.thing->momz) - P_DamageMobj(thing, tm.thing, tm.thing, 1, DMG_NORMAL); + P_DamageMobj(thing, tm.thing, tm.thing, 1, DMG_TUMBLE); } else if (thing->type == MT_SPIKE && thing->flags & MF_SOLID && tm.thing->player) // unfortunate player falls into spike?! { @@ -1269,11 +1269,11 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) { if (tm.thing->z + tm.thing->height <= thing->z - FixedMul(FRACUNIT, thing->scale) && tm.thing->z + tm.thing->height + tm.thing->momz >= thing->z - FixedMul(FRACUNIT, thing->scale)) - P_DamageMobj(tm.thing, thing, thing, 1, DMG_NORMAL); + P_DamageMobj(tm.thing, thing, thing, 1, DMG_TUMBLE); } else if (tm.thing->z >= thing->z + thing->height + FixedMul(FRACUNIT, thing->scale) && tm.thing->z + tm.thing->momz <= thing->z + thing->height + FixedMul(FRACUNIT, thing->scale)) - P_DamageMobj(tm.thing, thing, thing, 1, DMG_NORMAL); + P_DamageMobj(tm.thing, thing, thing, 1, DMG_TUMBLE); } if (tm.thing->type == MT_WALLSPIKE && tm.thing->flags & MF_SOLID && thing->player) // wall spike impales player