From 7f07fa9b2d533b81f3a7e6e5cced07a3f669fcb9 Mon Sep 17 00:00:00 2001
From: Sally Cochenour <tehrealsalt@gmail.com>
Date: Sun, 22 Mar 2020 16:23:56 -0400
Subject: [PATCH] Move item box counter stuff into k_battle

---
 src/doomstat.h | 1 -
 src/g_game.c   | 4 ----
 src/k_battle.c | 4 ++++
 src/k_battle.h | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/doomstat.h b/src/doomstat.h
index 0b36fc753..855866483 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -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))
 
 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.
   */
diff --git a/src/g_game.c b/src/g_game.c
index 679f45974..3018c33e8 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -199,10 +199,6 @@ UINT32 bluescore, redscore; // CTF and Team Match team scores
 // ring count... for PERFECT!
 INT32 nummaprings = 0;
 
-// box respawning in battle mode
-INT32 nummapboxes = 0;
-INT32 numgotboxes = 0;
-
 // Elminates unnecessary searching.
 boolean CheckForBustableBlocks;
 boolean CheckForBouncySector;
diff --git a/src/k_battle.c b/src/k_battle.c
index 0eef0127c..6b3fb310a 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -23,6 +23,10 @@ struct battleovertime battleovertime;
 // Capsules mode enabled for this map?
 boolean battlecapsules = false;
 
+// box respawning in battle mode
+INT32 nummapboxes = 0;
+INT32 numgotboxes = 0;
+
 // Capsule counters
 UINT8 maptargets = 0; // Capsules in map
 UINT8 numtargets = 0; // Capsules busted
diff --git a/src/k_battle.h b/src/k_battle.h
index bbada65f3..b69938d39 100644
--- a/src/k_battle.h
+++ b/src/k_battle.h
@@ -12,6 +12,7 @@ extern struct battleovertime
 } battleovertime;
 
 extern boolean battlecapsules;
+extern INT32 nummapboxes, numgotboxes; // keep track of spawned battle mode items
 extern UINT8 maptargets, numtargets;
 
 INT32 K_StartingBumperCount(void);