Removed ctrl+q binding. All OS have their own binding for window closing.

[lugaru.git] / Source / OpenGL_Windows.cpp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 18f7d25bec4198ef7c5b99a160e6901dc1f6b674..c78dc28755817be7376ad9edb5c1d5cedeb76800 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -17,10 +18,16 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#ifdef WIN32
-#include <windows.h>
-#endif
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+#include <fstream>
+#include <iostream>
+#include <zlib.h>
+#include <set>
+#include "gamegl.h"
+#include "MacCompatibility.h"
+#include "Settings.h"
 
 #include "Game.h"
 
@@ -28,6 +35,12 @@ using namespace Game;
 
 #include "openal_wrapper.h"
 
+#ifdef WIN32
+#include <windows.h>
+#include <shellapi.h>
+#include "win-res/resource.h"
+#endif
+
 extern float multiplier;
 extern float sps;
 extern float realmultiplier;
@@ -35,46 +48,20 @@ extern int slomo;
 extern bool cellophane;
 extern float texdetail;
 
-extern bool osx;
 extern bool freeze;
 extern bool stillloading;
 extern int mainmenu;
-/*extern*/
-bool gameFocused;
 
 extern float slomospeed;
 extern float slomofreq;
 extern bool visibleloading;
 
-
-
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <fstream>
-#include <iostream>
-#include <zlib.h>
-#include <set>
-#include "gamegl.h"
-#include "MacCompatibility.h"
-#include "Settings.h"
-
-#ifdef WIN32
-#include <shellapi.h>
-#include "win-res/resource.h"
-#endif
-
 extern SDL_Window *sdlwindow;
 
 using namespace std;
 
 set<pair<int,int>> resolutions;
 
-bool SetUp ();
-void DoUpdate ();
-
-void CleanUp (void);
-
 // statics/globals (internal only) ------------------------------------------
 
 #ifdef _MSC_VER
@@ -135,8 +122,6 @@ static void GLAPIENTRY glDeleteTextures_doNothing(GLsizei n, const GLuint *textu
 int kContextWidth;
 int kContextHeight;
 
-bool gDone = false;
-
 static int _argc = 0;
 static char **_argv = NULL;
 
@@ -217,7 +202,7 @@ void toggleFullscreen()
     SDL_SetWindowFullscreen(sdlwindow, flags);
 }
 
-static SDL_bool sdlEventProc(const SDL_Event &e)
+SDL_bool sdlEventProc(const SDL_Event &e)
 {
     switch (e.type) {
         case SDL_QUIT:
@@ -260,7 +245,6 @@ bool SetUp ()
 {
     LOGFUNC;
 
-    osx = 0;
     cellophane = 0;
     texdetail = 4;
     slomospeed = 0.25;
@@ -684,15 +668,13 @@ int main(int argc, char **argv)
         {
             newGame();
 
-            //ofstream os("error.txt");
-            //os.close();
-            //ofstream os("log.txt");
-            //os.close();
-
             if (!SetUp ())
                 return 42;
 
-            while (!gDone && !tryquit) {
+            bool gameDone = false;
+            bool gameFocused = true;
+
+            while (!gameDone && !tryquit) {
                 if (IsFocused()) {
                     gameFocused = true;
 
@@ -705,7 +687,7 @@ int main(int argc, char **argv)
                         // message pump
                         while ( SDL_PollEvent( &e ) ) {
                             if (!sdlEventProc(e)) {
-                                gDone = true;
+                                gameDone = true;
                                 break;
                             }
                         }
@@ -740,9 +722,7 @@ int main(int argc, char **argv)
         LOG(e);
 
         MessageBox(g_windowHandle, error.what(), "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    }
 
-    CleanUp();
-
-    return -1;
+        return -1;
+    }
 }