Moved clothes loop to Person, got rid of globals tintr,tintg,tintb

[lugaru.git] / Source / Globals.cpp

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 5fc6c5586d5b2c17b8872f217c848050ef4254d2..78d8098471bd2a10ab198a2990924983664f842a 100644 (file)
--- 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.
 
@@ -29,7 +30,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Objects.h"
 #include "Weapons.h"
 #include "Person.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
 #include "openal_wrapper.h"
 #include "Stereo.h"
 
@@ -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;
@@ -88,7 +88,6 @@ GLubyte bloodText[512 * 512 * 3] = {0};
 GLubyte wolfbloodText[512 * 512 * 3] = {0};
 float colors[3] = {0};
 int bloodtoggle = 0;
-bool osx = false;
 float camerashake = 0;
 float woozy = 0;
 float blackout = 0;
@@ -167,7 +166,7 @@ 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;
@@ -178,7 +177,6 @@ bool tiltweird = false;
 bool midweird = false;
 bool proportionweird = false;
 bool vertexweird[6] = {0};
-ImageRec texture;
 bool debugmode = false;
 
 
@@ -186,8 +184,6 @@ bool campaign = false;
 
 bool gamestarted = false;
 
-//TextureList textures;
-
 StereoMode stereomode =  stereoNone;
 StereoMode newstereomode = stereoNone;
 float stereoseparation = 0.05;