[Pingus-CVS] r2577 - trunk/src

[jave27]

Author: jave27
Date: 2006-01-05 21:24:28 +0100 (Thu, 05 Jan 2006)
New Revision: 2577

Modified:
   trunk/src/globals.cxx
   trunk/src/pingus_main.cxx
   trunk/src/pingus_main.hxx
Log:
Moved the 'use_opengl' variable declaration back to where it should be.  Not 
sure if we want to default to SDL for non-Windows systems or not...  Can 
revisit later.

Modified: trunk/src/globals.cxx
===================================================================
--- trunk/src/globals.cxx       2006-01-05 20:13:56 UTC (rev 2576)
+++ trunk/src/globals.cxx       2006-01-05 20:24:28 UTC (rev 2577)
@@ -41,8 +41,12 @@
 #else
 bool        fullscreen_enabled              = false;
 #endif
+// The clanSDL target is a little buggy on Windows - Use OpenGL by default
+bool        use_opengl                      = true;
 #else
 bool        fullscreen_enabled              = false;
+// Use the clanSDL target by default for systems other than Windows.
+bool        use_opengl                      = false;
 #endif
 int         screen_width                    = 800;
 int         screen_height                   = 600;
@@ -50,8 +54,11 @@
 bool        swcursor_enabled                = false;
 std::string config_file;
 bool        max_cpu_usage                   = true;
-bool        use_opengl                      = true;
-bool        action_help                     = true;
+#ifdef WIN32
+#else
+#endif
+
+       bool        action_help                     = true;
 bool        show_input_debug_screen         = false;
 bool        render_preview                  = false;
 

Modified: trunk/src/pingus_main.cxx
===================================================================
--- trunk/src/pingus_main.cxx   2006-01-05 20:13:56 UTC (rev 2576)
+++ trunk/src/pingus_main.cxx   2006-01-05 20:24:28 UTC (rev 2577)
@@ -125,13 +125,6 @@
   blitter_test(false),
   refresh_rate(60)
 {
-#ifdef WIN32
-       // The clanSDL target is a little buggy on Windows - Use OpenGL by 
default
-       use_opengl = true;
-#else
-       // Use the clanSDL target by default otherwise.
-       use_opengl = false;
-#endif
 }
 
 PingusMain::~PingusMain()

Modified: trunk/src/pingus_main.hxx
===================================================================
--- trunk/src/pingus_main.hxx   2006-01-05 20:13:56 UTC (rev 2576)
+++ trunk/src/pingus_main.hxx   2006-01-05 20:24:28 UTC (rev 2577)
@@ -37,7 +37,6 @@
   bool    blitter_test;
   bool    no_config_file;
   bool    show_credits;
-       bool    use_opengl;
 
   /// the name of the exe: argv[0]
   std::string executable_name;