thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'spraycan-final' into 'master'

Browse source 
Spray Can spawning rule cleanup

Closes #1198

See merge request KartKrew/Kart!2175
This commit is contained in:
James R. 2024-03-27 09:18:31 +00:00
commit 026b91c49b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.c
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;

3
src/p_setup.cpp
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