Merge branch 'eid-spawn-duel-tutorial' into 'master'

Spawn duel items in tutorial

Closes #1600

See merge request kart-krew-dev/ring-racers-internal!2684
This commit is contained in:
Eidolon 2025-07-16 17:40:41 -05:00
commit 31f1b373c0

View file

@ -13005,12 +13005,12 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i)
// spawn all the duel mode objects itself, which ends up // spawn all the duel mode objects itself, which ends up
// calling this function again. // calling this function again.
// So that's why this check is even here. // So that's why this check is even here.
if (inDuel == false && (grandprixinfo.gp == false || grandprixinfo.eventmode != GPEVENT_BONUS)) if (inDuel == false && (grandprixinfo.gp == false || grandprixinfo.eventmode != GPEVENT_BONUS) && gametype != GT_TUTORIAL)
{ {
if (K_IsDuelItem(i) == true if (K_IsDuelItem(i) == true
&& K_DuelItemAlwaysSpawns(mthing) == false) && K_DuelItemAlwaysSpawns(mthing) == false)
{ {
// Only spawns in Duels or GP bonus rounds. // Only spawns in Duels, GP bonus rounds or Tutorials.
return false; return false;
} }
} }