merge

[lugaru.git] / Source / Globals.cpp

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index be2a006d633eddc0f4f4d18a061bbe90d8125596..eae0bd07f0590fbda565f78b41bd0c97c2a3068e 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -19,9 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#if USE_SDL
 #include "SDL.h"
-#endif
 
 #include "gamegl.h"
 #include "Quaternions.h"
@@ -35,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Person.h"
 #include "TGALoader.h"
 #include "openal_wrapper.h"
+#include "Stereo.h"
 
 #include "Constants.h"
 
@@ -79,15 +78,9 @@ int numsounds = 0;
 Terrain terrain;
 Sprites sprites;
 float sps = 0;
-#ifdef WIN32
-HDC hDC;
-#elif USE_SDL
+
 SDL_Surface *sdlscreen;
-#elif PLATFORM_MACOSX
-AGLContext gaglContext;
-#else
-#error Define your platform.
-#endif
+
 int kTextureSize = 0;
 int detail = 0;
 FRUSTUM frustum;
@@ -123,12 +116,11 @@ int flashdelay = 0;
 bool vblsync = 0;
 float motionbluramount = 0;
 bool keyboardfrozen = 0;
-int newnetmessages = 0;
-char netmessages[256] = {0};
 char mapname[256] = {0};
 bool loadingstuff = 0;
 bool stillloading = 0;
 bool showpoints = 0;
+bool showdamagebar = 0;
 bool alwaysblur = 0;
 bool immediate = 0;
 bool velocityblur = 0;
@@ -277,3 +269,7 @@ bool gamestarted = 0;
 
 //TextureList textures;
 
+StereoMode stereomode =  stereoNone;
+StereoMode newstereomode = stereoNone;
+float stereoseparation = 0.05;
+bool  stereoreverse = false;
\ No newline at end of file