Merge branch 'fix-whip-buzzsaw' into 'master'

Fix instawhip buzzsaw oneshotting the UFO

See merge request KartKrew/Kart!1579
This commit is contained in:
toaster 2023-10-24 09:00:21 +00:00
commit 844f868bed

View file

@ -788,6 +788,7 @@ static UINT8 GetUFODamage(mobj_t *inflictor, UINT8 damageType)
{ {
targetdamaging = UFOD_WHIP; targetdamaging = UFOD_WHIP;
ret = 10; ret = 10;
inflictor->extravalue2 = 1; // Disable whip collision
break; break;
} }
case MT_JAWZ: case MT_JAWZ: