thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename numspraycans to nummapspraycans

Browse source 
- Consistency with nummaprings
- Prevents confusion with incoming gamedata struct variable
This commit is contained in:
toaster 2023-08-22 23:03:46 +01:00
parent f7635c4399
commit 3ccf668fda
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomstat.h
View file

@ -713,7 +713,7 @@ extern INT32 luabanks[NUM_LUABANKS];
extern INT32 nummaprings; //keep track of spawned rings/coins extern INT32 nummaprings; //keep track of spawned rings/coins
extern UINT8 numspraycans; extern UINT8 nummapspraycans;
extern UINT32 bluescore; ///< Blue Team Scores extern UINT32 bluescore; ///< Blue Team Scores
extern UINT32 redscore; ///< Red Team Scores extern UINT32 redscore; ///< Red Team Scores

2
src/g_game.c
View file

@ -219,7 +219,7 @@ UINT32 bluescore, redscore; // CTF and Team Match team scores
// ring count... for PERFECT! // ring count... for PERFECT!
INT32 nummaprings = 0; INT32 nummaprings = 0;
UINT8 numspraycans = 0; UINT8 nummapspraycans = 0;
// Elminates unnecessary searching. // Elminates unnecessary searching.
boolean CheckForBustableBlocks; boolean CheckForBustableBlocks;

8
src/p_mobj.c
View file

@ -12914,10 +12914,10 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
} }
case MT_SPRAYCAN: case MT_SPRAYCAN:
{ {
if (numspraycans) if (nummapspraycans)
{ {
if (numspraycans != UINT8_MAX) if (nummapspraycans != UINT8_MAX)
numspraycans++; nummapspraycans++;
P_RemoveMobj(mobj); P_RemoveMobj(mobj);
return false; return false;
@ -12926,7 +12926,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
P_SetScale(mobj, mobj->destscale = 2*mobj->scale); P_SetScale(mobj, mobj->destscale = 2*mobj->scale);
P_SprayCanInit(mobj); P_SprayCanInit(mobj);
numspraycans++; nummapspraycans++;
break; break;
} }
case MT_SKYBOX: case MT_SKYBOX:

6
src/p_setup.c
View file

@ -816,7 +816,7 @@ static void P_SpawnMapThings(boolean spawnemblems)
if (spawnemblems) if (spawnemblems)
{ {
if (numspraycans == 0) if (nummapspraycans == 0)
{ {
UINT16 col = mapheaderinfo[gamemap-1]->cachedcan; UINT16 col = mapheaderinfo[gamemap-1]->cachedcan;
@ -825,7 +825,7 @@ static void P_SpawnMapThings(boolean spawnemblems)
CONS_Alert(CONS_WARNING, "SPRAY CANS: Map has assigned Spray Cans but no pickup placed!\n"); CONS_Alert(CONS_WARNING, "SPRAY CANS: Map has assigned Spray Cans but no pickup placed!\n");
} }
} }
else if (numspraycans > 1) else if (nummapspraycans > 1)
CONS_Alert(CONS_ERROR, "SPRAY CANS: Map has too many Spray Cans (%d)!", numspraycans); CONS_Alert(CONS_ERROR, "SPRAY CANS: Map has too many Spray Cans (%d)!", numspraycans);
} }
} }
@ -7425,7 +7425,7 @@ static void P_InitLevelSettings(void)
maptargets = numtargets = 0; maptargets = numtargets = 0;
battleprisons = false; battleprisons = false;
numspraycans = 0; nummapspraycans = 0;
// emerald hunt // emerald hunt
hunt1 = hunt2 = hunt3 = NULL; hunt1 = hunt2 = hunt3 = NULL;