X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=bbe2df2e20b36a78647cd0ef55da87cd8970ed97;hb=e60cbd7add6123d81b3c35543296449b5d02cbaa;hp=9e688230bd2f3abd6d591eb6ec88bb324febd39e;hpb=3b325285c15e47e75ad5c9db05f7105f8b5af387;p=lugaru.git

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 9e68823..bbe2df2 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -18,25 +18,14 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "SDL.h"
-
-#include "gamegl.h"
-#include "Quaternions.h"
-#include "Lights.h"
-#include "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 "Animation.h"
-
-bool visibleloading = 0;
+#include "Graphic/Stereo.hpp"
+#include "Math/Quaternions.hpp"
+#include "Objects/Weapons.hpp"
+
+#include <SDL.h>
+#include <string>
+
+bool visibleloading = false;
 
 float volume = 0;
 bool ismotionblur = false;
@@ -44,7 +33,7 @@ float usermousesensitivity = 0;
 bool floatjump = false;
 bool cellophane = false;
 bool autoslomo = false;
-bool decals = false;
+bool decalstoggle = false;
 bool invertmouse = false;
 bool texttoggle = false;
 float blurness = 0;
@@ -66,7 +55,6 @@ int environment = 0;
 float texscale = 0;
 float gravity = 0;
 Light light;
-Animation animation[animation_count];
 Terrain terrain;
 
 SDL_Window *sdlwindow;
@@ -77,7 +65,6 @@ FRUSTUM frustum;
 float texdetail = 0;
 float realtexdetail = 0;
 float playerdist = 0;
-Objects objects;
 int slomo = 0;
 float slomodelay = 0;
 GLubyte bloodText[512 * 512 * 3] = {0};
@@ -109,25 +96,11 @@ 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;
 float slomofreq = 0;
 
-int tutoriallevel = 0;
-int tutorialstage = 0;
-float tutorialstagetime = 0;
-float tutorialmaxtime = 0;
-float tutorialsuccess = 0;
-
 bool againbonus = false;
 
 float damagedealt = 0;
@@ -157,9 +130,7 @@ float envsoundvol[30] = {0};
 float envsoundlife[30] = {0};
 int numenvsounds;
 
-bool debugmode = false;
-
-bool campaign = false;
+bool devtools = false;
 
 bool gamestarted = false;