thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mines with no target checking pickmeup

Browse source
This commit is contained in:
Antonio Martinez 2025-06-06 00:02:17 -04:00
parent 84fff960f2
commit cd68af7e92
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_collide.cpp
View file

@ -272,6 +272,8 @@ static inline BlockItReturn_t PIT_SSMineSearch(mobj_t *thing)
extern consvar_t cv_debugpickmeup; extern consvar_t cv_debugpickmeup;
if (!cv_debugpickmeup.value) if (!cv_debugpickmeup.value)
{
if (grenade->target && !P_MobjWasRemoved(grenade->target))
{ {
if (thing == grenade->target) // Don't blow up at your owner instantly. if (thing == grenade->target) // Don't blow up at your owner instantly.
return BMIT_CONTINUE; return BMIT_CONTINUE;
@ -279,7 +281,7 @@ static inline BlockItReturn_t PIT_SSMineSearch(mobj_t *thing)
if (grenade->target->player && thing->player && G_SameTeam(grenade->target->player, thing->player)) if (grenade->target->player && thing->player && G_SameTeam(grenade->target->player, thing->player))
return BMIT_CONTINUE; return BMIT_CONTINUE;
} }
}
if (PIT_SSMineChecks(thing) == true) if (PIT_SSMineChecks(thing) == true)
return BMIT_CONTINUE; return BMIT_CONTINUE;