X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=8c09b7b1304eaa3740fdf77ea4d7cc76d00db31b;hb=9bd0be2befdf81aa4b5d377eaf29656935044faf;hp=2d3da97cb6ce681eb10963ba4b1c3491995ff4a6;hpb=a7c9ba64aa7413abb4c566dad8dc796526952d3e;p=lugaru.git
diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 2d3da97..8c09b7b 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -23,7 +23,8 @@ along with Lugaru. If not, see .
#include "gamegl.h"
#include "Quaternions.h"
#include "Lights.h"
-#include "Skeleton.h"
+#include "Animation/Animation.h"
+#include "Animation/Skeleton.h"
#include "Terrain.h"
#include "Sprite.h"
#include "Frustum.h"
@@ -34,7 +35,6 @@ along with Lugaru. If not, see .
#include "openal_wrapper.h"
#include "Stereo.h"
-#include "Animation.h"
bool visibleloading = 0;
@@ -53,7 +53,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;
@@ -62,17 +61,12 @@ 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;
@@ -87,7 +81,6 @@ int slomo = 0;
float slomodelay = 0;
GLubyte bloodText[512 * 512 * 3] = {0};
GLubyte wolfbloodText[512 * 512 * 3] = {0};
-float colors[3] = {0};
int bloodtoggle = 0;
float camerashake = 0;
float woozy = 0;
@@ -103,24 +96,17 @@ 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];
@@ -130,8 +116,6 @@ char hotspottext[40][256] = {0};
int currenthotspot = 0;
int killhotspot = 0;
-float menupulse = 0;
-
float smoketex = 0;
float slomospeed = 0;
@@ -172,15 +156,8 @@ 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};
bool debugmode = false;
-
bool campaign = false;
bool gamestarted = false;