X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=9c5d79d6114faff20c08bd53f6d920e7f88f5000;hb=64560867a9b6486d601784a2fe4ba6149d31b7aa;hp=624aa587c1a619ec8fa7e72ada0f4c2cbfbcdabe;hpb=acc0e37a142590af4d878d2b92e4e3a0d8c51653;p=lugaru.git
diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 624aa58..9c5d79d 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -1,5 +1,6 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -22,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"
@@ -33,7 +35,6 @@ along with Lugaru. If not, see .
#include "openal_wrapper.h"
#include "Stereo.h"
-#include "Animation.h"
bool visibleloading = 0;
@@ -52,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;
@@ -61,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;
@@ -86,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;
@@ -102,34 +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];
-int hotspottype[40] = {0};
-float hotspotsize[40] = {0};
-char hotspottext[40][256] = {0};
-int currenthotspot = 0;
-int killhotspot = 0;
-
-float menupulse = 0;
float smoketex = 0;
@@ -166,27 +143,17 @@ float skyboxlightb = 0;
int hostile = 0;
float hostiletime = 0;
-XYZ envsound[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 gamestarted = false;
-//TextureList textures;
-
StereoMode stereomode = stereoNone;
StereoMode newstereomode = stereoNone;
float stereoseparation = 0.05;