Account active is now stored as an integer to avoid weird loops to find the right id

[lugaru.git] / Source / Globals.cpp

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 9e688230bd2f3abd6d591eb6ec88bb324febd39e..d8d430d0ab7549f2823b54f9e0d51836d1e304d9 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -23,7 +23,8 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "gamegl.h"
 #include "Quaternions.h"
 #include "Lights.h"
-#include "Skeleton.h"
+#include "Animation/Animation.h"
+#include "Animation/Skeleton.h"
 #include "Terrain.h"
 #include "Sprite.h"
 #include "Frustum.h"
@@ -34,7 +35,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "openal_wrapper.h"
 #include "Stereo.h"
 
-#include "Animation.h"
 
 bool visibleloading = 0;
 
@@ -66,7 +66,6 @@ int environment = 0;
 float texscale = 0;
 float gravity = 0;
 Light light;
-Animation animation[animation_count];
 Terrain terrain;
 
 SDL_Window *sdlwindow;
@@ -109,14 +108,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;
@@ -157,9 +148,7 @@ float envsoundvol[30] = {0};
 float envsoundlife[30] = {0};
 int numenvsounds;
 
-bool debugmode = false;
-
-bool campaign = false;
+bool devtools = false;
 
 bool gamestarted = false;