X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FGlobals.cpp;h=709e021f273778149893124dcb7ece7f272f92a7;hb=97989f58ab13c64fbe05e629d2b2a024a2c3cfa4;hp=ffc13d7f44a2dfe8772d4add4fa9319b00e7d841;hpb=531512ddd1b17458281b27a6f21be83bc2a9c16c;p=lugaru.git

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index ffc13d7..709e021 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -3,20 +3,18 @@ Copyright (C) 2003, 2010 - Wolfire Games
 
 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 +29,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,11 +52,12 @@ float windvar = 0;
 float precipdelay = 0;
 float gamespeed = 0;
 float oldgamespeed = 0;
-float tintr = 0,tintg = 0,tintb = 0;
+float tintr = 0, tintg = 0, tintb = 0;
 int difficulty = 0;
 float multiplier = 0;
 float realmultiplier = 0;
-float screenwidth = 0,screenheight = 0;
+float screenwidth = 0, screenheight = 0;
+bool fullscreen = 0;
 float viewdistance = 0;
 XYZ viewer;
 XYZ viewerfacing;
@@ -74,7 +73,7 @@ int numsounds = 0;
 Terrain terrain;
 float sps = 0;
 
-SDL_Surface *sdlscreen;
+SDL_Window *sdlwindow;
 
 int kTextureSize = 0;
 int detail = 0;
@@ -85,8 +84,8 @@ float playerdist = 0;
 Objects objects;
 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};
 float colors[3] = {0};
 int bloodtoggle = 0;
 bool osx = false;
@@ -98,12 +97,11 @@ bool musictoggle = false;
 bool trilinear;
 Weapons weapons;
 bool damageeffects = false;
-int numplayers = 0;
 bool ambientsound = false;
 bool mousejump = false;
 bool freeze = false;
 bool winfreeze = false;
-float flashamount = 0,flashr = 0,flashg = 0,flashb = 0;
+float flashamount = 0, flashr = 0, flashg = 0, flashb = 0;
 int flashdelay = 0;
 bool vblsync = false;
 float motionbluramount = 0;
@@ -129,7 +127,7 @@ XYZ hotspot[40];
 int hotspottype[40] = {0};
 float hotspotsize[40] = {0};
 char hotspottext[40][256] = {0};
-int currenthotspot = 0;	
+int currenthotspot = 0;
 int killhotspot = 0;
 
 float menupulse = 0;
@@ -180,11 +178,9 @@ bool tiltweird = false;
 bool midweird = false;
 bool proportionweird = false;
 bool vertexweird[6] = {0};
-TGAImageRec texture;
+ImageRec texture;
 bool debugmode = false;
 
-bool won = false;
-
 
 bool campaign = false;