thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 03:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-item-ties' into 'master'

Browse source 
Use cusval instead of cvmem to track item box break type (cvmem is used for VFX!)

Closes ring-racers#252

See merge request kart-krew-dev/ring-racers-internal!2910
This commit is contained in:
AJ Martinez 2025-09-28 01:02:07 +00:00
commit ab39175430
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_inter.c
View file

@ -496,7 +496,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->fuse) // This box is respawning, but was broken very recently (see P_FuseThink)
{
// What was this box broken as?
if (!K_ThunderDome() && special->cvmem && !(special->flags2 & MF2_BOSSDEAD))
if (!K_ThunderDome() && special->cusval && !(special->flags2 & MF2_BOSSDEAD))
K_StartItemRoulette(player, false);
else
K_StartItemRoulette(player, true);
@ -504,12 +504,12 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
else if (specialstate >= S_RANDOMITEM1 && specialstate <= S_RANDOMITEM12)
{
K_StartItemRoulette(player, false);
special->cvmem = 1; // Lenient pickup should be ITEM
special->cusval = 1; // Lenient pickup should be ITEM
}
else
{
K_StartItemRoulette(player, true);
special->cvmem = 0; // Lenient pickup should be RING
special->cusval = 0; // Lenient pickup should be RING
}
P_ItemPop(special);