X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=bfbc7ce07f6745bf8f179084328ee4534ca5ebc4;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hp=485b60768276156927ceb2da53ed5d804a1f2d8d;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git
diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 485b607..bfbc7ce 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -19,13 +19,13 @@ along with Lugaru. If not, see .
*/
#include "Graphic/Stereo.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
#include "Objects/Weapons.hpp"
#include
#include
-bool visibleloading = 0;
+bool visibleloading = false;
float volume = 0;
bool ismotionblur = false;
@@ -33,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;
@@ -57,7 +57,7 @@ float gravity = 0;
Light light;
Terrain terrain;
-SDL_Window *sdlwindow;
+SDL_Window* sdlwindow;
int kTextureSize = 0;
int detail = 0;
@@ -65,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;
@@ -94,20 +93,14 @@ bool immediate = false;
bool velocityblur = false;
XYZ windvector;
int mainmenu = 0;
-int whichjointstartarray[26] = {0};
-int whichjointendarray[26] = {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;
@@ -133,15 +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 devtools = false;
bool gamestarted = false;
-StereoMode stereomode = stereoNone;
+StereoMode stereomode = stereoNone;
StereoMode newstereomode = stereoNone;
float stereoseparation = 0.05;
-bool stereoreverse = false;
+bool stereoreverse = false;