In case the resolution settings in the config file have wrong values,

[lugaru.git] / Source / Globals.cpp

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index bbe2df2e20b36a78647cd0ef55da87cd8970ed97..41d81cb741ca19cc5a6c6faaaa46a4b18e0a06c8 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -19,7 +19,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Graphic/Stereo.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
 #include "Objects/Weapons.hpp"
 
 #include <SDL.h>
@@ -46,6 +46,8 @@ int difficulty = 0;
 float multiplier = 0;
 float realmultiplier = 0;
 float screenwidth = 0, screenheight = 0;
+float minscreenwidth = 640, minscreenheight = 480;
+float maxscreenwidth = 3000, maxscreenheight = 3000;
 bool fullscreen = 0;
 float viewdistance = 0;
 XYZ viewer;
@@ -57,7 +59,7 @@ float gravity = 0;
 Light light;
 Terrain terrain;
 
-SDL_Window *sdlwindow;
+SDL_Window* sdlwindow;
 
 int kTextureSize = 0;
 int detail = 0;
@@ -67,8 +69,6 @@ float realtexdetail = 0;
 float playerdist = 0;
 int slomo = 0;
 float slomodelay = 0;
-GLubyte bloodText[512 * 512 * 3] = {0};
-GLubyte wolfbloodText[512 * 512 * 3] = {0};
 int bloodtoggle = 0;
 float camerashake = 0;
 float woozy = 0;
@@ -93,8 +93,8 @@ bool immediate = false;
 bool velocityblur = false;
 XYZ windvector;
 int mainmenu = 0;
-int whichjointstartarray[26] = {0};
-int whichjointendarray[26] = {0};
+int whichjointstartarray[26] = { 0 };
+int whichjointendarray[26] = { 0 };
 
 float smoketex = 0;
 
@@ -126,15 +126,15 @@ int hostile = 0;
 float hostiletime = 0;
 
 XYZ envsound[30];
-float envsoundvol[30] = {0};
-float envsoundlife[30] = {0};
+float envsoundvol[30] = { 0 };
+float envsoundlife[30] = { 0 };
 int numenvsounds;
 
 bool devtools = false;
 
 bool gamestarted = false;
 
-StereoMode stereomode =  stereoNone;
+StereoMode stereomode = stereoNone;
 StereoMode newstereomode = stereoNone;
 float stereoseparation = 0.05;
-bool  stereoreverse = false;
+bool stereoreverse = false;