X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=9e688230bd2f3abd6d591eb6ec88bb324febd39e;hb=3b325285c15e47e75ad5c9db05f7105f8b5af387;hp=1cb6dbf7b8ce3e84e23b81516e2b75e0217750c5;hpb=dcacd1c62fda9af9a042b2327041ea057652f1b3;p=lugaru.git

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 1cb6dbf..9e68823 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -1,22 +1,21 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "SDL.h"
@@ -31,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Objects.h"
 #include "Weapons.h"
 #include "Person.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
 #include "openal_wrapper.h"
 #include "Stereo.h"
 
@@ -54,25 +53,21 @@ 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;
 float screenwidth = 0, screenheight = 0;
+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,9 +82,7 @@ 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;
-bool osx = false;
 float camerashake = 0;
 float woozy = 0;
 float blackout = 0;
@@ -104,24 +97,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];
@@ -131,8 +117,6 @@ char hotspottext[40][256] = {0};
 int currenthotspot = 0;
 int killhotspot = 0;
 
-float menupulse = 0;
-
 float smoketex = 0;
 
 float slomospeed = 0;
@@ -168,27 +152,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};
-TGAImageRec texture;
 bool debugmode = false;
 
-
 bool campaign = false;
 
 bool gamestarted = false;
 
-//TextureList textures;
-
 StereoMode stereomode =  stereoNone;
 StereoMode newstereomode = stereoNone;
 float stereoseparation = 0.05;