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

Merge branch 'mapper-ring-box' into 'master'

Browse source 
Ring Box mapper arg

See merge request KartKrew/Kart!1372
This commit is contained in:
James R 2023-08-08 22:18:14 +00:00
commit 14d76a10ec
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/objects/random-item.c
View file

@ -114,7 +114,7 @@ void Obj_RandomItemVisuals(mobj_t *mobj)
// the player's cleared out a good portion of the map. // the player's cleared out a good portion of the map.
// //
// Then extraval1 starts ticking up and triggers the transformation from Ringbox to Random Item. // Then extraval1 starts ticking up and triggers the transformation from Ringbox to Random Item.
if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING) if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING) && !(mobj->flags2 & MF2_AMBUSH)
&& !cv_thunderdome.value && !(modeattacking & ATTACKING_SPB)) && !cv_thunderdome.value && !(modeattacking & ATTACKING_SPB))
{ {
mobj->extravalue1++; mobj->extravalue1++;

2
src/p_mobj.c
View file

@ -13273,6 +13273,8 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
P_SetThingPosition(mobj); P_SetThingPosition(mobj);
} }
} }
if (mthing->args[0] == 1)
mobj->flags2 |= MF2_AMBUSH;
break; break;
} }
case MT_ITEMCAPSULE: case MT_ITEMCAPSULE: