From 98f385049d4f7e1c103d9a3b14b61d8ced942434 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Thu, 31 Jul 2025 21:02:58 -0400 Subject: [PATCH] Ballhog bugfixes --- src/k_collide.cpp | 3 +++ src/k_kart.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index fe3d0981b..62af4d285 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -75,6 +75,9 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2) if (t1->type == MT_BALLHOGBOOM && t2->type == MT_BALLHOGBOOM) return true; // Ballhogs don't collide with eachother + if (t1->type == MT_BALLHOGBOOM && t2->type == MT_PLAYER && t1->target == t2 ) + return true; // Allied hog explosion, not snatchable but shouldn't damage + if (K_TryPickMeUp(t1, t2, false)) return true; diff --git a/src/k_kart.c b/src/k_kart.c index f1450536c..79db29b42 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -14813,6 +14813,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground) } player->ballhogcharge = 0; + player->ballhogburst = 0; + S_StopSoundByID(player->mo, sfx_gshda); player->itemflags &= ~IF_HOLDREADY; player->botvars.itemconfirm = 0; }