X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=73bad7357d8592e59c3fee5efca10ff349949fe4;hb=0aab437dc560d2afa982e61cc2547756ad7b0761;hp=8c09b7b1304eaa3740fdf77ea4d7cc76d00db31b;hpb=4d0ec1838440e55f24e8ec9501a62348cd9e2ec3;p=lugaru.git

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 8c09b7b..73bad73 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -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 "Graphic/Stereo.hpp"
+#include "Math/XYZ.hpp"
+#include "Objects/Weapons.hpp"
 
-#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 <SDL.h>
+#include <string>
 
-
-bool visibleloading = 0;
+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;
@@ -68,7 +57,7 @@ float gravity = 0;
 Light light;
 Terrain terrain;
 
-SDL_Window *sdlwindow;
+SDL_Window* sdlwindow;
 
 int kTextureSize = 0;
 int detail = 0;
@@ -76,11 +65,10 @@ 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};
-GLubyte wolfbloodText[512 * 512 * 3] = {0};
+GLubyte bloodText[512 * 512 * 3] = { 0 };
+GLubyte wolfbloodText[512 * 512 * 3] = { 0 };
 int bloodtoggle = 0;
 float camerashake = 0;
 float woozy = 0;
@@ -105,28 +93,14 @@ bool immediate = false;
 bool velocityblur = false;
 XYZ windvector;
 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;
+int whichjointstartarray[26] = { 0 };
+int whichjointendarray[26] = { 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;
@@ -152,17 +126,15 @@ int hostile = 0;
 float hostiletime = 0;
 
 XYZ envsound[30];
-float envsoundvol[30] = {0};
-float envsoundlife[30] = {0};
+float envsoundvol[30] = { 0 };
+float envsoundlife[30] = { 0 };
 int numenvsounds;
 
-bool debugmode = false;
-
-bool campaign = false;
+bool devtools = false;
 
 bool gamestarted = false;
 
-StereoMode stereomode =  stereoNone;
+StereoMode stereomode = stereoNone;
 StereoMode newstereomode = stereoNone;
 float stereoseparation = 0.05;
-bool  stereoreverse = false;
+bool stereoreverse = false;