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

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 709e021..73bad73 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -17,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 "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>
 
-#include "Animation.h"
-
-bool visibleloading = 0;
+bool visibleloading = false;
 
 float volume = 0;
 bool ismotionblur = false;
@@ -43,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;
@@ -52,7 +42,6 @@ float windvar = 0;
 float precipdelay = 0;
 float gamespeed = 0;
 float oldgamespeed = 0;
-float tintr = 0, tintg = 0, tintb = 0;
 int difficulty = 0;
 float multiplier = 0;
 float realmultiplier = 0;
@@ -61,19 +50,14 @@ bool fullscreen = 0;
 float viewdistance = 0;
 XYZ viewer;
 XYZ viewerfacing;
-XYZ lightlocation;
 float fadestart = 0;
 int environment = 0;
 float texscale = 0;
 float gravity = 0;
 Light light;
-Animation animation[animation_count];
-Skeleton testskeleton;
-int numsounds = 0;
 Terrain terrain;
-float sps = 0;
 
-SDL_Window *sdlwindow;
+SDL_Window* sdlwindow;
 
 int kTextureSize = 0;
 int detail = 0;
@@ -81,14 +65,11 @@ 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};
-float colors[3] = {0};
+GLubyte bloodText[512 * 512 * 3] = { 0 };
+GLubyte wolfbloodText[512 * 512 * 3] = { 0 };
 int bloodtoggle = 0;
-bool osx = false;
 float camerashake = 0;
 float woozy = 0;
 float blackout = 0;
@@ -103,46 +84,23 @@ bool freeze = false;
 bool winfreeze = false;
 float flashamount = 0, flashr = 0, flashg = 0, flashb = 0;
 int flashdelay = 0;
-bool vblsync = false;
 float motionbluramount = 0;
-bool keyboardfrozen = false;
-bool loadingstuff = false;
 bool stillloading = false;
 bool showpoints = false;
 bool showdamagebar = false;
 bool alwaysblur = false;
 bool immediate = false;
 bool velocityblur = false;
-int test = 0;
 XYZ windvector;
-short vRefNum = 0;
-long dirID = 0;
 int mainmenu = 0;
-int whichjointstartarray[26] = {0};
-int whichjointendarray[26] = {0};
-int kBitsPerPixel = 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 menupulse = 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;
@@ -167,28 +125,16 @@ float skyboxlightb = 0;
 int hostile = 0;
 float hostiletime = 0;
 
-XYZ envsound[30]; // = {0};
-float envsoundvol[30] = {0};
-float envsoundlife[30] = {0};
+XYZ envsound[30];
+float envsoundvol[30] = { 0 };
+float envsoundlife[30] = { 0 };
 int numenvsounds;
 
-
-bool tilt2weird = false;
-bool tiltweird = false;
-bool midweird = false;
-bool proportionweird = false;
-bool vertexweird[6] = {0};
-ImageRec texture;
-bool debugmode = false;
-
-
-bool campaign = false;
+bool devtools = false;
 
 bool gamestarted = false;
 
-//TextureList textures;
-
-StereoMode stereomode =  stereoNone;
+StereoMode stereomode = stereoNone;
 StereoMode newstereomode = stereoNone;
 float stereoseparation = 0.05;
-bool  stereoreverse = false;
+bool stereoreverse = false;