thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-06 16:12:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt to fix the stupid bug where SPB decides to not hurt

Browse source
This commit is contained in:
TehRealSalt 2019-01-14 21:38:38 -05:00
parent 32030fae57
commit 1a10499779
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_inter.c
View file

@ -579,30 +579,31 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->health <= 0 || toucher->health <= 0) if (special->health <= 0 || toucher->health <= 0)
return; return;
if (!player->mo || player->spectator) if (player->spectator)
return; return;
if (special->tracer && toucher == special->tracer) if (special->tracer && !P_MobjWasRemoved(special->tracer) && toucher == special->tracer)
{ {
mobj_t *spbexplode; mobj_t *spbexplode;
S_StopSound(special); // Don't continue playing the gurgle or the siren if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0)
if (!player->kartstuff[k_invincibilitytimer] && !player->kartstuff[k_growshrinktimer])
{ {
player->powers[pw_flashing] = 0;
K_DropHnextList(player); K_DropHnextList(player);
K_StripItems(player); K_StripItems(player);
//player->powers[pw_flashing] = 0;
} }
S_StopSound(special); // Don't continue playing the gurgle or the siren
spbexplode = P_SpawnMobj(toucher->x, toucher->y, toucher->z, MT_SPBEXPLOSION); spbexplode = P_SpawnMobj(toucher->x, toucher->y, toucher->z, MT_SPBEXPLOSION);
spbexplode->extravalue1 = 1; // Tell K_ExplodePlayer to use extra knockback spbexplode->extravalue1 = 1; // Tell K_ExplodePlayer to use extra knockback
P_SetTarget(&spbexplode->target, special->target); if (special->target && !P_MobjWasRemoved(special->target))
P_SetTarget(&spbexplode->target, special->target);
P_RemoveMobj(special); P_RemoveMobj(special);
} }
else else
K_SpinPlayer(player, NULL, 0, special, false); K_SpinPlayer(player, special->target, 0, special, false);
return; return;
/*case MT_EERIEFOG: /*case MT_EERIEFOG:
special->frame &= ~FF_TRANS80; special->frame &= ~FF_TRANS80;