diff --git a/src/info.c b/src/info.c index b543282a6..01efdaa1e 100644 --- a/src/info.c +++ b/src/info.c @@ -15257,13 +15257,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed - 16*FRACUNIT, // radius + 32*FRACUNIT, // radius 32*FRACUNIT, // height 0, // display offset 100, // mass 1, // damage sfx_None, // activesound - MF_NOGRAVITY|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_DONTENCOREMAP, // flags + MF_NOGRAVITY|MF_DONTENCOREMAP, // flags S_NULL // raisestate }, diff --git a/src/k_collide.cpp b/src/k_collide.cpp index 3d503077f..6fac60d23 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -72,6 +72,9 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2) if (t1->type == MT_BALLHOG && t2->type == MT_BALLHOG) return true; // Ballhogs don't collide with eachother + if (t1->type == MT_BALLHOGBOOM && t2->type == MT_BALLHOGBOOM) + return true; // Ballhogs don't collide with eachother + if (K_TryPickMeUp(t1, t2)) return true; diff --git a/src/p_map.c b/src/p_map.c index 68c487acf..bdec595d7 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1084,7 +1084,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) return Obj_OrbinautJawzCollide(thing, g_tm.thing) ? BMIT_CONTINUE : BMIT_ABORT; } - if (g_tm.thing->type == MT_BANANA || g_tm.thing->type == MT_BANANA_SHIELD || g_tm.thing->type == MT_BALLHOG) + if (g_tm.thing->type == MT_BANANA || g_tm.thing->type == MT_BANANA_SHIELD || g_tm.thing->type == MT_BALLHOG || g_tm.thing->type == MT_BALLHOGBOOM) { // see if it went over / under if (g_tm.thing->z > thing->z + thing->height) @@ -1094,7 +1094,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) return K_BananaBallhogCollide(g_tm.thing, thing) ? BMIT_CONTINUE : BMIT_ABORT; } - else if (thing->type == MT_BANANA || thing->type == MT_BANANA_SHIELD || thing->type == MT_BALLHOG) + else if (thing->type == MT_BANANA || thing->type == MT_BANANA_SHIELD || thing->type == MT_BALLHOG || thing->type == MT_BALLHOGBOOM) { // see if it went over / under if (g_tm.thing->z > thing->z + thing->height)