Cleaned up a bit OpenGL_Windows.cpp, avoid calling CleanUp twice after exceptions

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 33ae0f8a9bba579f5dc30b7e8eb278a937c79cb7..d79162bf38930d2f10bdb9237cb708f7e56f6641 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -17,10 +17,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 +34,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;
@@ -44,33 +56,12 @@ 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
@@ -131,9 +122,6 @@ static void GLAPIENTRY glDeleteTextures_doNothing(GLsizei n, const GLuint *textu
 int kContextWidth;
 int kContextHeight;
 
-bool gDone = false;
-bool gameFocused;
-
 static int _argc = 0;
 static char **_argv = NULL;
 
@@ -684,7 +672,10 @@ int main(int argc, char **argv)
             if (!SetUp ())
                 return 42;
 
-            while (!gDone && !tryquit) {
+            bool gameDone = false;
+            bool gameFocused = true;
+
+            while (!gameDone && !tryquit) {
                 if (IsFocused()) {
                     gameFocused = true;
 
@@ -697,7 +688,7 @@ int main(int argc, char **argv)
                         // message pump
                         while ( SDL_PollEvent( &e ) ) {
                             if (!sdlEventProc(e)) {
-                                gDone = true;
+                                gameDone = true;
                                 break;
                             }
                         }
@@ -732,9 +723,7 @@ int main(int argc, char **argv)
         LOG(e);
 
         MessageBox(g_windowHandle, error.what(), "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    }
 
-    CleanUp();
-
-    return -1;
+        return -1;
+    }
 }