From 894870295abffacc4872da8b6dd3fb89e56403c5 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 26 Mar 2024 16:41:44 +0000 Subject: [PATCH] Spray Can spawning rule cleanup - You can spawn in Tutorial Challenge, but only if a single can has been picked up already - Don't print a (DEVELOP-only, but still annoying) error when it doesn't spawn in Tutorial Challenge --- src/p_mobj.c | 2 +- src/p_setup.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index a978b9446..1fda781c6 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -13095,7 +13095,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj) { if (nummapspraycans == UINT8_MAX || modeattacking != ATTACKING_NONE - || tutorialchallenge == TUTORIALSKIP_INPROGRESS) + || (tutorialchallenge == TUTORIALSKIP_INPROGRESS && gamedata->gotspraycans == 0)) { P_RemoveMobj(mobj); return false; diff --git a/src/p_setup.cpp b/src/p_setup.cpp index e50e17830..9618b1370 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -881,7 +881,8 @@ static void P_SpawnMapThings(boolean spawnemblems) if (spawnemblems && gametype != GT_TUTORIAL - && !modeattacking) + && !modeattacking + && !(tutorialchallenge == TUTORIALSKIP_INPROGRESS && gamedata->gotspraycans == 0)) { const UINT8 recommendedcans = #ifdef DEVELOP