thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-26 23:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'unmash-bananas' into 'master'

Browse source 
Unmash bananas

Closes #1447 and #1446

See merge request KartKrew/Kart!2424
This commit is contained in:
Oni 2024-08-24 23:44:13 +00:00
commit 5f7d08fd3c
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_collide.cpp
View file

@ -695,9 +695,9 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
S_StartSound(t2, sfx_kdtrg1);
}
if (t1->tracer && t1->tracer->player && t1->player && t1->player != t1->tracer->player)
if (t1->tracer && t1->tracer->player && t2->player && t2->player != t1->tracer->player)
{
K_SpawnAmps(t1->tracer->player, K_PvPAmpReward(20, t1->tracer->player, t1->player), t1);
K_SpawnAmps(t1->tracer->player, K_PvPAmpReward(20, t1->tracer->player, t2->player), t1);
}
if (draggeddroptarget && !P_MobjWasRemoved(draggeddroptarget) && draggeddroptarget->player)

4
src/p_inter.c
View file

@ -3300,10 +3300,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
type = DMG_STUMBLE;
}
if (inflictor && !P_MobjWasRemoved(inflictor) && P_IsKartItem(inflictor->type) && inflictor->cvmem)
if (inflictor && !P_MobjWasRemoved(inflictor) && P_IsKartItem(inflictor->type) && inflictor->cvmem
&& inflictor->type != MT_BANANA) // Are there other designed trap items that can be deployed and dropped? If you add one, list it here!
{
type = DMG_STUMBLE;
player->ringburst += 5; // IT'S THE DAMAGE STUMBLE HACK AGAIN AAAAAAAAHHHHHHHHHHH
K_PopPlayerShield(player);
}
switch (type)