Migrated to SDL2

[lugaru.git] / Source / Globals.cpp

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 9331aece415b44fc6475b76998321f2de6ba66ca..1cb6dbf7b8ce3e84e23b81516e2b75e0217750c5 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -10,7 +10,7 @@ of the License, or (at your option) any later version.
 
 This program 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.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -54,11 +54,11 @@ 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;
 float viewdistance = 0;
 XYZ viewer;
 XYZ viewerfacing;
@@ -74,7 +74,7 @@ int numsounds = 0;
 Terrain terrain;
 float sps = 0;
 
-SDL_Surface *sdlscreen;
+SDL_Window *sdlwindow;
 
 int kTextureSize = 0;
 int detail = 0;
@@ -85,8 +85,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 +98,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;
@@ -120,7 +119,6 @@ XYZ windvector;
 short vRefNum = 0;
 long dirID = 0;
 int mainmenu = 0;
-int oldmainmenu = 0;
 int whichjointstartarray[26] = {0};
 int whichjointendarray[26] = {0};
 int kBitsPerPixel = 0;
@@ -130,7 +128,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;
@@ -184,8 +182,6 @@ bool vertexweird[6] = {0};
 TGAImageRec texture;
 bool debugmode = false;
 
-bool won = false;
-
 
 bool campaign = false;