X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=90549550120b77c016b8ec2831d2937c0bdd7604;hb=d5f64d3689e1ce594e22ad0f6d372cee143872fd;hp=c5a336e6ce64b1b67bedfb4e3f25f82fecb01b21;hpb=afc437d91c5c31a6569349a118ace6876737889f;p=lugaru.git
diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index c5a336e..9054955 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 .
*/
-#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"
-
-
-bool visibleloading = 0;
+#include "Graphic/Stereo.hpp"
+#include "Math/XYZ.hpp"
+#include "Objects/Weapons.hpp"
+
+#include
+#include
+
+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;
@@ -76,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};
@@ -113,12 +101,6 @@ 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;
@@ -148,7 +130,7 @@ float envsoundvol[30] = {0};
float envsoundlife[30] = {0};
int numenvsounds;
-bool debugmode = false;
+bool devtools = false;
bool gamestarted = false;