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
This commit is contained in:
toaster 2024-03-26 16:41:44 +00:00
parent f442f933fc
commit 894870295a
2 changed files with 3 additions and 2 deletions

View file

@ -13095,7 +13095,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
{ {
if (nummapspraycans == UINT8_MAX if (nummapspraycans == UINT8_MAX
|| modeattacking != ATTACKING_NONE || modeattacking != ATTACKING_NONE
|| tutorialchallenge == TUTORIALSKIP_INPROGRESS) || (tutorialchallenge == TUTORIALSKIP_INPROGRESS && gamedata->gotspraycans == 0))
{ {
P_RemoveMobj(mobj); P_RemoveMobj(mobj);
return false; return false;

View file

@ -881,7 +881,8 @@ static void P_SpawnMapThings(boolean spawnemblems)
if (spawnemblems if (spawnemblems
&& gametype != GT_TUTORIAL && gametype != GT_TUTORIAL
&& !modeattacking) && !modeattacking
&& !(tutorialchallenge == TUTORIALSKIP_INPROGRESS && gamedata->gotspraycans == 0))
{ {
const UINT8 recommendedcans = const UINT8 recommendedcans =
#ifdef DEVELOP #ifdef DEVELOP