X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=inline;f=Source%2FGlobals.cpp;h=c5a336e6ce64b1b67bedfb4e3f25f82fecb01b21;hb=afc437d91c5c31a6569349a118ace6876737889f;hp=9e688230bd2f3abd6d591eb6ec88bb324febd39e;hpb=3b325285c15e47e75ad5c9db05f7105f8b5af387;p=lugaru.git
diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 9e68823..c5a336e 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -23,7 +23,8 @@ along with Lugaru. If not, see .
#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 .
#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;
@@ -159,8 +150,6 @@ int numenvsounds;
bool debugmode = false;
-bool campaign = false;
-
bool gamestarted = false;
StereoMode stereomode = stereoNone;