From 66d59efddcf8070270bce0603e11853c6ca1500d Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Mon, 17 Jul 2017 23:58:54 +0100 Subject: [PATCH] Sorry, MI. More info in forthcoming merge request. --- src/info.c | 10 +++++----- src/p_mobj.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/info.c b/src/info.c index 4f1a76c73..30f6c082d 100644 --- a/src/info.c +++ b/src/info.c @@ -5992,7 +5992,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { // MT_WALLSPIKE 522, // doomednum - S_WALLSPIKE1, // spawnstate + S_WALLSPIKE1, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -6005,9 +6005,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // missilestate S_NULL, // deathstate S_NULL, // xdeathstate - sfx_None, // deathsound + sfx_None, // deathsound 2*TICRATE, // speed - 32*FRACUNIT, // radius + 16*FRACUNIT, // radius 14*FRACUNIT, // height 0, // display offset 4, // mass @@ -6019,7 +6019,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { // MT_WALLSPIKEBASE -1, // doomednum - S_WALLSPIKEBASE, // spawnstate + S_WALLSPIKEBASE, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -6034,7 +6034,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed - 7*FRACUNIT, // radius + FRACUNIT/4, // radius 14*FRACUNIT, // height 0, // display offset 4, // mass diff --git a/src/p_mobj.c b/src/p_mobj.c index 2bb370f50..c6847df30 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10146,7 +10146,7 @@ ML_NOCLIMB : Direction not controllable // spawn base { const angle_t mobjangle = FixedAngle(mthing->angle*FRACUNIT); // the mobj's own angle hasn't been set quite yet so... - const fixed_t baseradius = mobj->radius/2 - FixedMul(FRACUNIT, mobj->scale); + const fixed_t baseradius = mobj->radius - FixedMul(mobjinfo[MT_WALLSPIKEBASE].radius, mobj->scale); mobj_t *base = P_SpawnMobj( mobj->x - P_ReturnThrustX(mobj, mobjangle, baseradius), mobj->y - P_ReturnThrustY(mobj, mobjangle, baseradius),