Don't define variables in header files.

diff --git a/src/bosses.cpp b/src/bosses.cpp
index 7c4c26a2a309cc5a39d68ae2d57bfa256e9d6dba..385da517fc389a447f7dbe77fd47fb44324852c1 100644 (file)
--- a/src/bosses.cpp
+++ b/src/bosses.cpp
@@ -21,6 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "bosses.h"
 
+// this is used exclusively by the bosses
+Boss *self;
+
 void tankBossLevel()
 {
        if (player.health < 1)

diff --git a/src/bosses.h b/src/bosses.h
index 19a488ac0059e2757382cd83544ae66851b2d1cf..248201cc4fdf82c67a682a2d537d5853a6492dbb 100644 (file)
--- a/src/bosses.h
+++ b/src/bosses.h
@@ -50,6 +50,3 @@ extern Map map;
 
 extern Entity player;
 extern Entity defItem[MAX_ITEMS];
-
-// this is used exclusively by the bosses
-Boss *self;

diff --git a/src/cutscene.cpp b/src/cutscene.cpp
index b119f5e0054c7440b374c0e4ade0e02754e14dbe..1592addfa241d1d9f8c0788322d898117dad00da 100644 (file)
--- a/src/cutscene.cpp
+++ b/src/cutscene.cpp
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "cutscene.h"
 
+List sceneList;
+
 void createSceneList()
 {
        char sceneLine[1024] = "";

diff --git a/src/cutscene.h b/src/cutscene.h
index 2b0775a46ae7b1ff59b370fd812301b103e02954..87043aa0642d08345c00781e8fc71564a90b91c0 100644 (file)
--- a/src/cutscene.h
+++ b/src/cutscene.h
@@ -28,5 +28,3 @@ extern GameData gameData;
 extern Graphics graphics;
 
 extern Game game;
-
-List sceneList;

diff --git a/src/main.cpp b/src/main.cpp
index 9516517cae265d62ecc3ef37e7c1ba3ea17c546e..a92a49b046fc3c27bfc91d68a6c13e6a9e872c84 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,6 +24,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <locale.h>
 
+Audio audio;
+Config config;
+Engine engine;
+Game game;
+GameData gameData;
+Graphics graphics;
+Map map;
+ReplayData replayData;
+MedalServer medalServer;
+
+Entity defEnemy[MAX_ENEMIES];
+Entity defItem[MAX_ITEMS];
+Entity player;
+Weapon weapon[MAX_WEAPONS];
+
 void showVersion()
 {
        printf(_(

diff --git a/src/main.h b/src/main.h
index 2ebcd5aafaabf93bb3015e2704baefe0c68f76c3..3c7ad936cd020d41a8e2df77c2905fa39dacb1ff 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -47,18 +47,3 @@ extern void checkStartCutscene();
 extern void easyGameFinished();
 
 extern void presentPlayerMedal(const char *tname);
-
-Audio audio;
-Config config;
-Engine engine;
-Game game;
-GameData gameData;
-Graphics graphics;
-Map map;
-ReplayData replayData;
-MedalServer medalServer;
-
-Entity defEnemy[MAX_ENEMIES];
-Entity defItem[MAX_ITEMS];
-Entity player;
-Weapon weapon[MAX_WEAPONS];

diff --git a/src/mapEditor.cpp b/src/mapEditor.cpp
index edcf430dfc99f6562cac5678a7b2f5d4fadd9a61..97bf2b8375d85c54ac017107da9ba898bd76b01d 100644 (file)
--- a/src/mapEditor.cpp
+++ b/src/mapEditor.cpp
@@ -21,6 +21,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "mapEditor.h"
 
+String *stringHead = new String;
+String *stringTail = stringHead;
+
+Audio audio;
+Engine engine;
+Game game;
+GameData gameData;
+Graphics graphics;
+Map map;
+
+Entity defEnemy[MAX_ENEMIES];
+Entity defItem[MAX_ITEMS];
+Entity player;
+Weapon weapon[MAX_WEAPONS];
+
 MedalServer medalServer;
 Config config;
 ReplayData replayData;

diff --git a/src/mapEditor.h b/src/mapEditor.h
index ebaa1838ececcce515760cc986e1d234f7236897..5209a249cdfa8a3a23c948d0a9356c3a6599d77f 100644 (file)
--- a/src/mapEditor.h
+++ b/src/mapEditor.h
@@ -55,18 +55,3 @@ class String {
                }
 
 };
-
-String *stringHead = new String;
-String *stringTail = stringHead;
-
-Audio audio;
-Engine engine;
-Game game;
-GameData gameData;
-Graphics graphics;
-Map map;
-
-Entity defEnemy[MAX_ENEMIES];
-Entity defItem[MAX_ITEMS];
-Entity player;
-Weapon weapon[MAX_WEAPONS];