thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ballhog bugfixes

Browse source
This commit is contained in:
Antonio Martinez 2025-07-31 21:02:58 -04:00
parent 9784fd6d97
commit 98f385049d
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_collide.cpp
View file

@ -75,6 +75,9 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2)
if (t1->type == MT_BALLHOGBOOM && t2->type == MT_BALLHOGBOOM) if (t1->type == MT_BALLHOGBOOM && t2->type == MT_BALLHOGBOOM)
return true; // Ballhogs don't collide with eachother 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)) if (K_TryPickMeUp(t1, t2, false))
return true; return true;

2
src/k_kart.c
View file

@ -14813,6 +14813,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
player->ballhogcharge = 0; player->ballhogcharge = 0;
player->ballhogburst = 0;
S_StopSoundByID(player->mo, sfx_gshda);
player->itemflags &= ~IF_HOLDREADY; player->itemflags &= ~IF_HOLDREADY;
player->botvars.itemconfirm = 0; player->botvars.itemconfirm = 0;
} }