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

Move item box counter stuff into k_battle

Browse source
This commit is contained in:
Sally Cochenour 2020-03-22 16:23:56 -04:00
parent 198b9770f7
commit 7f07fa9b2d
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/doomstat.h
View file

@ -372,7 +372,6 @@ extern UINT16 emeralds;
#define ALL7EMERALDS(v) ((v & (EMERALD1|EMERALD2|EMERALD3|EMERALD4|EMERALD5|EMERALD6|EMERALD7)) == (EMERALD1|EMERALD2|EMERALD3|EMERALD4|EMERALD5|EMERALD6|EMERALD7)) #define ALL7EMERALDS(v) ((v & (EMERALD1|EMERALD2|EMERALD3|EMERALD4|EMERALD5|EMERALD6|EMERALD7)) == (EMERALD1|EMERALD2|EMERALD3|EMERALD4|EMERALD5|EMERALD6|EMERALD7))
extern INT32 nummaprings; // keep track of spawned rings/coins extern INT32 nummaprings; // keep track of spawned rings/coins
extern INT32 nummapboxes, numgotboxes; // keep track of spawned battle mode items
/** Time attack information, currently a very small structure. /** Time attack information, currently a very small structure.
*/ */

4
src/g_game.c
View file

@ -199,10 +199,6 @@ UINT32 bluescore, redscore; // CTF and Team Match team scores
// ring count... for PERFECT! // ring count... for PERFECT!
INT32 nummaprings = 0; INT32 nummaprings = 0;
// box respawning in battle mode
INT32 nummapboxes = 0;
INT32 numgotboxes = 0;
// Elminates unnecessary searching. // Elminates unnecessary searching.
boolean CheckForBustableBlocks; boolean CheckForBustableBlocks;
boolean CheckForBouncySector; boolean CheckForBouncySector;

4
src/k_battle.c
View file

@ -23,6 +23,10 @@ struct battleovertime battleovertime;
// Capsules mode enabled for this map? // Capsules mode enabled for this map?
boolean battlecapsules = false; boolean battlecapsules = false;
// box respawning in battle mode
INT32 nummapboxes = 0;
INT32 numgotboxes = 0;
// Capsule counters // Capsule counters
UINT8 maptargets = 0; // Capsules in map UINT8 maptargets = 0; // Capsules in map
UINT8 numtargets = 0; // Capsules busted UINT8 numtargets = 0; // Capsules busted

1
src/k_battle.h
View file

@ -12,6 +12,7 @@ extern struct battleovertime
} battleovertime; } battleovertime;
extern boolean battlecapsules; extern boolean battlecapsules;
extern INT32 nummapboxes, numgotboxes; // keep track of spawned battle mode items
extern UINT8 maptargets, numtargets; extern UINT8 maptargets, numtargets;
INT32 K_StartingBumperCount(void); INT32 K_StartingBumperCount(void);