Move some global vars from Globals.cpp, add decls to headers

diff --git a/Source/Game.h b/Source/Game.h
index d501b8c7e78906775932b5d8e0cd7f50797a8f47..d7714c3fccea40ff1bdc37ff00a9593f58ceb016 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -319,4 +319,5 @@ extern "C" { void UndefinedSymbolToExposeStubbedCode(void); }
 #define STUBBED(x) { static bool seen = false; if (!seen) { seen = true; fprintf(stderr, "STUBBED: %s at %s:%d\n", x, __FILE__, __LINE__); } }
 //#define STUBBED(x)
 
+extern int numplayers;
 #endif

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 7bc613ab0820537dd6d5e49481b74393fc5fec7c..34926564c6b4937fc0bb3921f5a57a808140b204 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -45,8 +45,6 @@ extern int detail;
 extern float usermousesensitivity;
 extern bool osx;
 extern float camerashake;
-extern Weapons weapons;
-extern Person player[maxplayers];
 extern int slomo;
 extern float slomodelay;
 extern bool ismotionblur;
@@ -54,7 +52,6 @@ extern float woozy;
 extern float blackout;
 extern bool damageeffects;
 extern float volume;
-extern int numplayers;
 extern bool texttoggle;
 extern float blurness;
 extern float targetblurness;

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index da5516cb1abf2352a270386ba6660681a3770025..ed1edac3ce8320c059b334963de618eae55734af 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -51,9 +51,6 @@ extern bool ismotionblur;
 extern bool trilinear;
 extern bool osx;
 extern bool musictoggle;
-extern Weapons weapons;
-extern Person player[maxplayers];
-extern int numplayers;
 extern int environment;
 extern bool ambientsound;
 extern float multiplier;

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index d9f821aa293f073f3d42484247e539f200d89c03..ef7598485386444b5a3476c33efc27419acb6818 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -70,9 +70,6 @@ extern float blackout;
 extern bool cellophane;
 extern bool musictoggle;
 extern int difficulty;
-extern Weapons weapons;
-extern Person player[maxplayers];
-extern int numplayers;
 extern int bloodtoggle;
 extern bool invertmouse;
 extern float windvar;

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 5dbf5c4548616f93e4c6841e9029f28f6d776497..365e48a900e7e9eb37f49e6b8aad2d26952331ca 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -70,9 +70,7 @@ extern float terraindetail;
 extern float texdetail;
 
 extern bool osx;
-extern int numplayers;
 extern bool freeze;
-extern Person player[maxplayers];
 extern bool stillloading;
 extern int mainmenu;
 /*extern*/ bool gameFocused;

diff --git a/Source/Person.cpp b/Source/Person.cpp
index 5f2a2d94815126ddd59fd9bd74bbc40e2ac3f316..05eeb5f7218bc9fa9bb48a02b4fbdc25dbdd59cc 100644 (file)
--- a/Source/Person.cpp
+++ b/Source/Person.cpp
@@ -24,6 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "openal_wrapper.h"
 #include "Animation.h"
 #include "Sounds.h"
+#include "Awards.h"
+#include "Game.h"
 
 extern float multiplier;
 extern int channels[100];
@@ -51,11 +53,8 @@ extern float terraindetail;
 extern float viewdistance;
 extern float blackout;
 extern int difficulty;
-extern Weapons weapons;
 extern bool decals;
 extern float fadestart;
-extern Person player[maxplayers];
-extern int numplayers;
 extern bool freeze;
 extern bool winfreeze;
 extern float flashamount,flashr,flashg,flashb;

diff --git a/Source/Person.h b/Source/Person.h
index 27666e4bf904fe99cd04b1d1c0b1d3e50710a665..5c5a96983c2c17abffd02dc568d22232c8736183 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -373,4 +373,5 @@ class Person
                void RagDoll(bool checkcollision);
 };
 
+extern Person player[maxplayers];
 #endif

diff --git a/Source/Sprite.cpp b/Source/Sprite.cpp
index f0991afc4be6fbf73b15af2fb52d77b8ff95c457..02eb22071056271026d62437816c22ac16d27a29 100644 (file)
--- a/Source/Sprite.cpp
+++ b/Source/Sprite.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "Sprite.h"
 #include "Person.h"
+#include "Game.h"
 extern XYZ viewer;
 extern float viewdistance;
 extern float fadestart;
@@ -36,8 +37,6 @@ extern XYZ viewerfacing;
 extern float terraindetail;
 extern int bloodtoggle;
 extern XYZ windvector;
-extern int numplayers;
-extern Person player[maxplayers];
 
 // init statics
 GLuint Sprite::cloudtexture = 0;

diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp
index 267bd149d1ea2547fd5fa8ad64586d92cedc48ce..7745b8996670fe5f0c7def5647ddc5c8fbfc5e00 100644 (file)
--- a/Source/Weapons.cpp
+++ b/Source/Weapons.cpp
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "openal_wrapper.h"
 #include "Animation.h"
 #include "Sounds.h"
+#include "Game.h"
 
 extern float multiplier;
 extern int channels[100];
@@ -49,8 +50,6 @@ extern float terraindetail;
 extern float viewdistance;
 extern float blackout;
 extern int difficulty;
-extern Person player[maxplayers];
-extern int numplayers;
 extern bool freeze;
 extern int bonus;
 extern float bonusvalue;

diff --git a/Source/Weapons.h b/Source/Weapons.h
index d9fa2f67208bc2f4bd2496f4b50b985d50282f39..bbe18049455c83621e75bbc2a7aa6a54a1dd84a1 100644 (file)
--- a/Source/Weapons.h
+++ b/Source/Weapons.h
@@ -114,4 +114,5 @@ public:
        ~Weapons();
 };
 
+extern Weapons weapons;
 #endif