mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'fix-spb-grow' into 'master'
SPB explosion ignores Grow Closes #1102 See merge request KartKrew/Kart!1996
This commit is contained in:
commit
2501649ccd
1 changed files with 3 additions and 1 deletions
|
|
@ -2935,7 +2935,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
||||||
{
|
{
|
||||||
sfx = sfx_invind;
|
sfx = sfx_invind;
|
||||||
}
|
}
|
||||||
else if (K_IsBigger(target, inflictor) == true)
|
else if (K_IsBigger(target, inflictor) == true &&
|
||||||
|
// SPB bypasses grow (K_IsBigger handles NULL check)
|
||||||
|
(type != DMG_EXPLODE || inflictor->type != MT_SPBEXPLOSION || !inflictor->movefactor))
|
||||||
{
|
{
|
||||||
sfx = sfx_grownd;
|
sfx = sfx_grownd;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue