X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=73bad7357d8592e59c3fee5efca10ff349949fe4;hb=0aab437dc560d2afa982e61cc2547756ad7b0761;hp=7184ce2f887d3b0021714f7fec1f997dd76d40db;hpb=e66f03512f2e3471462c3927f47e464711eb7ae8;p=lugaru.git diff --git a/Source/Globals.cpp b/Source/Globals.cpp index 7184ce2..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. @@ -19,7 +19,7 @@ along with Lugaru. If not, see . */ #include "Graphic/Stereo.hpp" -#include "Math/Quaternions.hpp" +#include "Math/XYZ.hpp" #include "Objects/Weapons.hpp" #include @@ -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; @@ -67,8 +67,8 @@ float realtexdetail = 0; float playerdist = 0; 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; @@ -93,8 +93,8 @@ 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; @@ -126,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;