Consolidate bonus externs

diff --git a/Source/Awards.cpp b/Source/Awards.cpp
index 47bfc7bfa51d60fde14d7efad5bf580c05078421..8640bdf948b2eea78184becff7b1066dbbc2171c 100644 (file)
--- a/Source/Awards.cpp
+++ b/Source/Awards.cpp
@@ -23,6 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Person.h"
 #include "Game.h"
 
+int bonus;
+float bonusvalue;
+float bonustotal;
+float startbonustotal;
+float bonustime;
+
 // FIXME: make these per-player
 float damagetaken;
 int numfalls;

diff --git a/Source/Awards.h b/Source/Awards.h
index d146ada3fcad8e556d2421143a9945fccff4bf2c..9168f1cbd786da45d30baade5d75005092ded11f 100644 (file)
--- a/Source/Awards.h
+++ b/Source/Awards.h
@@ -35,6 +35,13 @@ static const char *bonus_names[bonus_count] = {
 #undef DECLARE_BONUS
 };
 
+extern int bonus;
+extern float bonusvalue;
+extern float bonustotal;
+extern float bonustime;
+extern float startbonustotal;
+extern float bonusnum[100];
+
 enum award_types {
 #define DECLARE_AWARD(id, name) id,
 #include "Awards.def"

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 3b93f28ddbe4831fd6a92dd976845f8fe92316a3..c98a3d29608b411029aae548d3d1cfb02f2f5351 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -81,13 +81,6 @@ extern bool decals;
 //extern int texdetail;
 extern float texdetail;
 extern bool musictoggle;
-extern int bonus;
-extern float bonusvalue;
-extern float bonustotal;
-extern float bonustime;
-extern int oldbonus;
-extern float startbonustotal;
-extern float bonusnum[100];
 extern int tutoriallevel;
 extern float smoketex;
 extern float tutorialstagetime;

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 466da3ed7f5cae785acc2b96faf596baf2dfa50b..5c292f722c1fa1b2a8227806f36ed5e6ebb8a311 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -112,14 +112,7 @@ extern bool decals;
 extern bool vblsync;
 extern bool immediate;
 extern bool velocityblur;
-extern int bonus;
-extern int oldbonus;
-extern float bonusvalue;
-extern float bonustotal;
-extern float bonustime;
-extern float startbonustotal;
 extern float tintr,tintg,tintb;
-extern float bonusnum[100];
 extern bool skyboxtexture;
 extern float skyboxr;
 extern float skyboxg;

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index bf622bf128de9c0d712caf8fc235acd19a62539f..20a5452d41e9cbc33fc111e4d4b266ee25318837 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -218,13 +218,6 @@ bool vertexweird[6] = {0};
 TGAImageRec texture;
 bool debugmode = 0;
 
-int oldbonus = 0;
-int bonus = 0;
-float bonusvalue = 0;
-float bonustotal = 0;
-float startbonustotal = 0;
-float bonustime = 0;
-
 bool won = 0;
 
 

diff --git a/Source/Person.cpp b/Source/Person.cpp
index d77c81e6b47b3cb341ccc12f691158970f1a79f8..ca2c51d48e2b74066b85dcf6e39efc57c47f17cd 100644 (file)
--- a/Source/Person.cpp
+++ b/Source/Person.cpp
@@ -72,10 +72,6 @@ extern XYZ envsound[30];
 extern float envsoundvol[30];
 extern float envsoundlife[30];
 extern int numenvsounds;
-extern int bonus;
-extern float bonusvalue;
-extern float bonustotal;
-extern float bonustime;
 extern int tutoriallevel;
 extern float smoketex;
 extern int tutorialstage;

diff --git a/Source/Skeleton.cpp b/Source/Skeleton.cpp
index 9683f5572cd983f5a20fb319a89dbcfd3a6ed9cf..34a5aa5574bfb140c0b7ac845a4d081eb89640bd 100644 (file)
--- a/Source/Skeleton.cpp
+++ b/Source/Skeleton.cpp
@@ -40,8 +40,6 @@ extern XYZ envsound[30];
 extern float envsoundvol[30];
 extern int numenvsounds;
 extern float envsoundlife[30];
-extern int bonus;
-extern float bonustime;
 extern int tutoriallevel;
 
 extern int whichjointstartarray[26];

diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp
index 128e7cebf235c4188a19bc5e169c95f349270778..212bdb453d946de39ba3e2aa0961544e5ff14470 100644 (file)
--- a/Source/Weapons.cpp
+++ b/Source/Weapons.cpp
@@ -52,10 +52,6 @@ extern float viewdistance;
 extern float blackout;
 extern int difficulty;
 extern bool freeze;
-extern int bonus;
-extern float bonusvalue;
-extern float bonustotal;
-extern float bonustime;
 extern int tutoriallevel;
 extern int numthrowkill;
 extern "C"     void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);