Error message box on win32

Author: Franticware

src/OpenMRac-SDL2.pro

@@ -81,6 +81,7 @@ HEADERS += \
     controls.h \
     cstring1.h \
     datkey.h \
+    error_msg.h \
     fopendir.h \
     gameaux.h \
     gamemng.h \

src/error_msg.h

@@ -0,0 +1,24 @@
+#ifndef ERROR_MSG_H
+#define ERROR_MSG_H
+
+#if defined(__WIN32__)
+
+#include <SDL2/SDL.h>
+
+extern SDL_Window* gameWindow;
+
+#define error_msg(...) do { \
+    char buff[256] = {0}; snprintf(buff, 255, __VA_ARGS__); \
+    size_t len = strlen(buff); \
+    if (len > 0 && buff[len - 1] == '\n') buff[len - 1] = 0; \
+    SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", buff, gameWindow); \
+} while (0)
+
+#else
+
+#include <cstdio>
+#define error_msg(...) do { fprintf(stderr, __VA_ARGS__); fflush(stderr); } while (0)
+
+#endif
+
+#endif // ERROR_MSG_H

src/ghost.cpp

@@ -3,6 +3,7 @@
 #include "appdefs.h"
 #include <cstdio>
 #include <algorithm>
+#include <memory>
 
 Ghost::Ghost(bool frames) {
     m_version = 104;
@@ -21,27 +22,26 @@ bool Ghost::load(int track, int reverse) {
     m_reverse = reverse;
     char filename[1024];
     getfname(filename);
-    FILE* fin = fopenDir(filename, "rb", OPENMRAC_ORG, OPENMRAC_APP);
-    if (fin == NULL) return false;
-    if (fread(&m_version, sizeof(int), 1, fin) != 1) {fclose(fin); return false;}
-    if (m_version != 104) {fclose(fin); return false;}
-    if (fread(&m_track, sizeof(int), 1, fin) != 1) {fclose(fin); return false;}
-    if (m_track != track) {fclose(fin); return false;}
-    if (fread(&m_reverse, sizeof(int), 1, fin) != 1) {fclose(fin); return false;}
-    if (m_reverse != reverse) {fclose(fin); return false;}
-    if (fread(&m_car, sizeof(int), 1, fin) != 1) {fclose(fin); return false;}
-    if (m_car < 0 || m_car >= 3) {fclose(fin); return false;}
-    if (fread(&m_carcolor, sizeof(int), 1, fin) != 1) {fclose(fin); return false;}
-    if (m_carcolor < 0 || m_carcolor >= 4) {fclose(fin); return false;}
-    if (fread(&m_seconds, sizeof(float), 1, fin) != 1) {fclose(fin); return false;}
-    if (m_seconds < 10.0 || m_seconds > 31536000.0) {fclose(fin); return false;}
+    std::unique_ptr<FILE, decltype(&fclose)> fin(fopenDir(filename, "rb", OPENMRAC_ORG, OPENMRAC_APP), &fclose);
+    if (fin.get() == nullptr) return false;
+    if (fread(&m_version, sizeof(int), 1, fin.get()) != 1) return false;
+    if (m_version != 104) return false;
+    if (fread(&m_track, sizeof(int), 1, fin.get()) != 1) return false;
+    if (m_track != track) return false;
+    if (fread(&m_reverse, sizeof(int), 1, fin.get()) != 1) return false;
+    if (m_reverse != reverse) return false;
+    if (fread(&m_car, sizeof(int), 1, fin.get()) != 1) return false;
+    if (m_car < 0 || m_car >= 3) return false;
+    if (fread(&m_carcolor, sizeof(int), 1, fin.get()) != 1) return false;
+    if (m_carcolor < 0 || m_carcolor >= 4) return false;
+    if (fread(&m_seconds, sizeof(float), 1, fin.get()) != 1) return false;
+    if (m_seconds < 10.0 || m_seconds > 31536000.0) return false;
     if (!m_frames.empty())
     {
-        if (fread(&m_num, sizeof(int), 1, fin) != 1) {fclose(fin); return false;}
-        if (m_num < 0 || m_num > m_maxnum) {fclose(fin); return false;}
-        if (static_cast<int>(fread(m_frames.data(), sizeof(float)*4, m_num, fin)) != m_num) {fclose(fin); return false;}
+        if (fread(&m_num, sizeof(int), 1, fin.get()) != 1) return false;
+        if (m_num < 0 || m_num > m_maxnum) return false;
+        if (static_cast<int>(fread(m_frames.data(), sizeof(float)*4, m_num, fin.get())) != m_num) return false;
     }
-    fclose(fin);
     return true;
 }
 

src/main.cpp

@@ -8,6 +8,7 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_endian.h>
 #include "gl1.h"
+#include "error_msg.h"
 
 #ifdef USE_MINIAL
 #include "minial.h"
@@ -1091,17 +1092,24 @@ int EnableOpenGL(bool fullscreen, bool vsync, int width, int height)
 
     if (!gameWindow)
     {
-        fprintf(stderr, "SDL window not created: %s\n", SDL_GetError()); fflush(stdout);
+        error_msg("SDL window not created: %s\n", SDL_GetError());
         SDL_Quit();
         return 1;
     }
 
     // Create our opengl context and attach it to our window
     maincontext = SDL_GL_CreateContext(gameWindow);
 
+    if (!maincontext)
+    {
+        error_msg("GL context not created: %s\n", SDL_GetError());
+        SDL_Quit();
+        return 1;
+    }
+
     if (!initGlExt())
     {
-        fprintf(stderr, "%s\n", GLEXT_ERROR_MESSAGE); fflush(stdout);
+        error_msg("%s\n", GLEXT_ERROR_MESSAGE);
         SDL_Quit();
         return 1;
     }