thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ufo-no-hit' into 'master'

Browse source 
Only let items and player hit special UFO; fix SPB not registering hit on UFO correctly

Closes #774

See merge request KartKrew/Kart!1707
This commit is contained in:
Oni 2023-12-24 16:30:05 +00:00
commit 66e2610236
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/objects/ufo.c
View file

@ -813,9 +813,13 @@ static UINT8 GetUFODamage(mobj_t *inflictor, UINT8 damageType)
break; break;
} }
case MT_SPB: case MT_SPB:
case MT_SPBEXPLOSION:
{ {
if (inflictor->type != MT_SPBEXPLOSION || inflictor->threshold == KITEM_SPB)
{
targetdamaging |= UFOD_SPB;
}
// SPB deals triple damage. // SPB deals triple damage.
targetdamaging |= UFOD_SPB;
ret = 30; ret = 30;
break; break;
} }
@ -834,6 +838,14 @@ static UINT8 GetUFODamage(mobj_t *inflictor, UINT8 damageType)
ret = 10; ret = 10;
break; break;
} }
case MT_GARDENTOP:
{
// Garden Top is not classified as a "field
// item" because the player can ride it. So
// an explicit case is necessary.
ret = 10;
break;
}
case MT_PLAYER: case MT_PLAYER:
{ {
// Players deal damage relative to how many sneakers they used. // Players deal damage relative to how many sneakers they used.
@ -849,6 +861,11 @@ static UINT8 GetUFODamage(mobj_t *inflictor, UINT8 damageType)
} }
default: default:
{ {
// General hazards cannot damage the UFO
if (P_IsKartFieldItem(inflictor->type) == false)
{
return 0;
}
break; break;
} }
} }