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 'ringbox-mace' into 'master'

Browse source 
Fix random items on maces stuck as Ring Box (resolves #712)

Closes #712

See merge request KartKrew/Kart!1555
This commit is contained in:
Oni 2023-10-17 09:29:27 +00:00
commit 59661f33a7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/objects/random-item.c
View file

@ -48,7 +48,7 @@ static player_t *GetItemBoxPlayer(mobj_t *mobj)
if (P_CanPickupItem(&players[i], 1)) if (P_CanPickupItem(&players[i], 1))
{ {
// Check for players who can take this pickup, but won't be allowed to (antifarming) // Check for players who can take this pickup, but won't be allowed to (antifarming)
UINT8 mytype = (mobj->flags2 & MF2_AMBUSH) ? 2 : 1; UINT8 mytype = (mobj->flags2 & MF2_BOSSDEAD) ? 2 : 1;
if (P_IsPickupCheesy(&players[i], mytype)) if (P_IsPickupCheesy(&players[i], mytype))
continue; continue;
@ -120,7 +120,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) && !(mobj->flags2 & MF2_AMBUSH) && !cv_thunderdome.value if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING) && !(mobj->flags2 & MF2_BOSSDEAD) && !cv_thunderdome.value
&& (modeattacking == 0 || specialstageinfo.valid)) // Time Attacking in Special is a fucked-looking exception && (modeattacking == 0 || specialstageinfo.valid)) // Time Attacking in Special is a fucked-looking exception
{ {
mobj->extravalue1++; mobj->extravalue1++;

2
src/p_mobj.c
View file

@ -13581,7 +13581,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
} }
} }
if (mthing->thing_args[0] == 1) if (mthing->thing_args[0] == 1)
mobj->flags2 |= MF2_AMBUSH; mobj->flags2 |= MF2_BOSSDEAD;
break; break;
} }
case MT_ITEMCAPSULE: case MT_ITEMCAPSULE: