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

Merge branch 'reduce-ballhog-active-frames' into 'master'

Browse source 
Ballhog active frames 26 -> 15

Closes #1638

See merge request kart-krew-dev/ring-racers-internal!2756
This commit is contained in:
Oni VelocitOni 2025-08-25 04:42:09 +00:00
commit df972ada45
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_collide.cpp
View file

@ -75,7 +75,8 @@ 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 ) extern consvar_t cv_debugpickmeup;
if (t1->type == MT_BALLHOGBOOM && t2->type == MT_PLAYER && t1->target == t2 && !cv_debugpickmeup.value)
return true; // Allied hog explosion, not snatchable but shouldn't damage return true; // Allied hog explosion, not snatchable but shouldn't damage
if (K_TryPickMeUp(t1, t2, false)) if (K_TryPickMeUp(t1, t2, false))

8
src/p_mobj.c
View file

@ -7557,6 +7557,14 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
P_MobjCheckWater(mobj); P_MobjCheckWater(mobj);
} }
break; break;
case MT_BALLHOGBOOM:
{
if ((mobj->frame & FF_FRAMEMASK) >= 15)
{
mobj->flags |= MF_NOCLIPTHING;
}
break;
}
case MT_SINK: case MT_SINK:
if (mobj->momx || mobj->momy) if (mobj->momx || mobj->momy)
{ {