thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bubble reflect Drop Targets

Browse source
This commit is contained in:
James R 2022-09-24 05:04:24 -07:00
parent b2268157fd
commit 7a8a377d93
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_collide.c
View file

@ -711,7 +711,7 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
} }
else else
{ {
if (!t2->threshold) if (!t2->threshold || t2->type == MT_DROPTARGET)
{ {
if (!t2->momx && !t2->momy) if (!t2->momx && !t2->momy)
{ {

2
src/p_map.c
View file

@ -917,6 +917,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
|| tm.thing->type == MT_BANANA || tm.thing->type == MT_EGGMANITEM || tm.thing->type == MT_BALLHOG || tm.thing->type == MT_BANANA || tm.thing->type == MT_EGGMANITEM || tm.thing->type == MT_BALLHOG
|| tm.thing->type == MT_SSMINE || tm.thing->type == MT_LANDMINE || tm.thing->type == MT_SINK || tm.thing->type == MT_SSMINE || tm.thing->type == MT_LANDMINE || tm.thing->type == MT_SINK
|| tm.thing->type == MT_GARDENTOP || tm.thing->type == MT_GARDENTOP
|| tm.thing->type == MT_DROPTARGET
|| (tm.thing->type == MT_PLAYER && thing->target != tm.thing))) || (tm.thing->type == MT_PLAYER && thing->target != tm.thing)))
{ {
// see if it went over / under // see if it went over / under
@ -933,6 +934,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
|| thing->type == MT_BANANA || thing->type == MT_EGGMANITEM || thing->type == MT_BALLHOG || thing->type == MT_BANANA || thing->type == MT_EGGMANITEM || thing->type == MT_BALLHOG
|| thing->type == MT_SSMINE || thing->type == MT_LANDMINE || thing->type == MT_SINK || thing->type == MT_SSMINE || thing->type == MT_LANDMINE || thing->type == MT_SINK
|| thing->type == MT_GARDENTOP || thing->type == MT_GARDENTOP
|| thing->type == MT_DROPTARGET
|| (thing->type == MT_PLAYER && tm.thing->target != thing))) || (thing->type == MT_PLAYER && tm.thing->target != thing)))
{ {
// see if it went over / under // see if it went over / under