Sorted all source files in folders

[lugaru.git] / Source / Globals.cpp

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 8c09b7b1304eaa3740fdf77ea4d7cc76d00db31b..66c6c9bc6a37781e244c9a52ee62c5d4dedec902 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -20,21 +20,11 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "SDL.h"
 
-#include "gamegl.h"
-#include "Quaternions.h"
-#include "Lights.h"
-#include "Animation/Animation.h"
-#include "Animation/Skeleton.h"
-#include "Terrain.h"
-#include "Sprite.h"
-#include "Frustum.h"
-#include "Objects.h"
-#include "Weapons.h"
-#include "Person.h"
-#include "ImageIO.h"
-#include "openal_wrapper.h"
-#include "Stereo.h"
+#include <string>
 
+#include "Graphic/Stereo.h"
+#include "Math/Quaternions.h"
+#include "Objects/Weapons.h"
 
 bool visibleloading = 0;
 
@@ -108,14 +98,6 @@ int mainmenu = 0;
 int whichjointstartarray[26] = {0};
 int whichjointendarray[26] = {0};
 
-int numhotspots = 0;
-XYZ hotspot[40];
-int hotspottype[40] = {0};
-float hotspotsize[40] = {0};
-char hotspottext[40][256] = {0};
-int currenthotspot = 0;
-int killhotspot = 0;
-
 float smoketex = 0;
 
 float slomospeed = 0;
@@ -156,9 +138,7 @@ float envsoundvol[30] = {0};
 float envsoundlife[30] = {0};
 int numenvsounds;
 
-bool debugmode = false;
-
-bool campaign = false;
+bool devtools = false;
 
 bool gamestarted = false;