From f975df6d6d0823c9b9e41036cf29a5dd9474fb1c Mon Sep 17 00:00:00 2001 From: Eidolon Date: Mon, 29 Jan 2024 18:48:49 -0600 Subject: [PATCH] Allow MT_BATTLECAPSULE to spawn in tutorials Fixes KartKrew/Kart#949 --- src/p_setup.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 32e62d59e..16483fc80 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -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)