thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-22 10:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'allow-battle-capsule-in-tutorial' into 'master'

Browse source 
Allow MT_BATTLECAPSULE to spawn in tutorials

Closes #949

See merge request KartKrew/Kart!1890
This commit is contained in:
Eidolon 2024-02-06 01:45:18 +00:00
commit 0e1f688139
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_setup.cpp
View file

@ -807,10 +807,14 @@ static void P_SpawnMapThings(boolean spawnemblems)
continue; // These were already spawned
}
if (mt->type == mobjinfo[MT_BATTLECAPSULE].doomednum
|| mt->type == mobjinfo[MT_ITEMCAPSULE].doomednum)
if (mt->type == mobjinfo[MT_ITEMCAPSULE].doomednum)
{
continue; // These will spawn later
continue; // These will spawn later (in k_battle.c K_BattleInit)
}
if (mt->type == mobjinfo[MT_BATTLECAPSULE].doomednum && gametype != GT_TUTORIAL)
{
continue; // These will spawn later (in k_battle.c K_BattleInit), unless we're in a tutorial
}
if (!spawnemblems && mt->type == mobjinfo[MT_EMBLEM].doomednum)