diff --git a/src/doomstat.h b/src/doomstat.h index 017abd566..06e0825aa 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -487,15 +487,6 @@ extern INT16 votelevels[5][2]; extern SINT8 votes[MAXPLAYERS]; extern SINT8 pickedvote; -/** Battle overtime information - */ -extern struct battleovertime -{ - UINT16 enabled; ///< Has this been initalized yet? - fixed_t radius, minradius; ///< Radius of kill field - fixed_t x, y, z; ///< Position to center on -} battleovertime; - extern tic_t hidetime; extern UINT32 timesBeaten; // # of times the game has been beaten. diff --git a/src/k_battle.c b/src/k_battle.c index bd44ff8fa..5f5073a2b 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -17,6 +17,9 @@ #include "m_random.h" #include "r_sky.h" // skyflatnum +// Battle overtime info +struct battleovertime battleovertime; + // Capsules mode enabled for this map? boolean battlecapsules = false; diff --git a/src/k_battle.h b/src/k_battle.h index 8f9bbf202..902347d68 100644 --- a/src/k_battle.h +++ b/src/k_battle.h @@ -4,8 +4,12 @@ #include "doomtype.h" #include "d_player.h" -// Battle overtime system -struct battleovertime battleovertime; +extern struct battleovertime +{ + UINT16 enabled; ///< Has this been initalized yet? + fixed_t radius, minradius; ///< Radius of kill field + fixed_t x, y, z; ///< Position to center on +} battleovertime; extern boolean battlecapsules; extern UINT8 maptargets, numtargets;