Review main (#458)

alexbatalov · Feb 15, 2025 · 2de7472 · 2de7472
1 parent d631bfc
commit 2de7472
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 39 deletions.
diff --git a/src/audio_engine.cc b/src/audio_engine.cc
@@ -95,10 +95,6 @@ static void audioEngineMixin(void* userData, Uint8* stream, int length)
 
 bool audioEngineInit()
 {
-    if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) {
-        return false;
-    }
-
     SDL_AudioSpec desiredSpec;
     desiredSpec.freq = 22050;
     desiredSpec.format = AUDIO_S16;
@@ -122,10 +118,6 @@ void audioEngineExit()
         SDL_CloseAudioDevice(gAudioEngineDeviceId);
         gAudioEngineDeviceId = -1;
     }
-
-    if (SDL_WasInit(SDL_INIT_AUDIO)) {
-        SDL_QuitSubSystem(SDL_INIT_AUDIO);
-    }
 }
 
 void audioEnginePause()

diff --git a/src/dinput.cc b/src/dinput.cc
@@ -8,10 +8,6 @@ static int gMouseWheelDeltaY = 0;
 // 0x4E0400
 bool directInputInit()
 {
-    if (SDL_InitSubSystem(SDL_INIT_EVENTS) != 0) {
-        return false;
-    }
-
     if (!mouseDeviceInit()) {
         goto err;
     }
@@ -32,7 +28,6 @@ bool directInputInit()
 // 0x4E0478
 void directInputFree()
 {
-    SDL_QuitSubSystem(SDL_INIT_EVENTS);
 }
 
 // 0x4E04E8

diff --git a/src/svga.cc b/src/svga.cc
@@ -175,10 +175,6 @@ int _GNW95_init_window(int width, int height, bool fullscreen, int scale)
     if (gSdlWindow == nullptr) {
         SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl");
 
-        if (SDL_Init(SDL_INIT_VIDEO) != 0) {
-            return -1;
-        }
-
         Uint32 windowFlags = SDL_WINDOW_OPENGL | SDL_WINDOW_ALLOW_HIGHDPI;
 
         if (fullscreen) {

diff --git a/src/win32.cc b/src/win32.cc
@@ -18,32 +18,24 @@
 
 namespace fallout {
 
-#ifdef _WIN32
 // 0x51E444
 bool gProgramIsActive = false;
 
-// GNW95MUTEX
-HANDLE _GNW95_mutex = nullptr;
+#ifdef _WIN32
+HANDLE GNW95_mutex = nullptr;
+#endif
 
-// 0x4DE700
 int main(int argc, char* argv[])
 {
-    _GNW95_mutex = CreateMutexA(0, TRUE, "GNW95MUTEX");
-    if (GetLastError() == ERROR_SUCCESS) {
-        SDL_ShowCursor(SDL_DISABLE);
+    int rc;
 
-        gProgramIsActive = true;
-        falloutMain(argc, argv);
-
-        CloseHandle(_GNW95_mutex);
+#if _WIN32
+    GNW95_mutex = CreateMutexA(0, TRUE, "GNW95MUTEX");
+    if (GetLastError() != ERROR_SUCCESS) {
+        return 0;
     }
-    return 0;
-}
-#else
-bool gProgramIsActive = false;
+#endif
 
-int main(int argc, char* argv[])
-{
 #if __APPLE__ && TARGET_OS_IOS
     SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
     SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
@@ -62,12 +54,24 @@ int main(int argc, char* argv[])
     chdir(SDL_AndroidGetExternalStoragePath());
 #endif
 
+    if (SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS) != 0) {
+        return EXIT_FAILURE;
+    }
+
+    atexit(SDL_Quit);
+
     SDL_ShowCursor(SDL_DISABLE);
+
     gProgramIsActive = true;
-    return falloutMain(argc, argv);
-}
+    rc = falloutMain(argc, argv);
+
+#if _WIN32
+    CloseHandle(GNW95_mutex);
 #endif
 
+    return rc;
+}
+
 } // namespace fallout
 
 int main(int argc, char* argv[])

diff --git a/src/win32.h b/src/win32.h
@@ -9,7 +9,7 @@ namespace fallout {
 
 #ifdef _WIN32
 extern bool gProgramIsActive;
-extern HANDLE _GNW95_mutex;
+extern HANDLE GNW95_mutex;
 #else
 extern bool gProgramIsActive;
 #endif

diff --git a/src/window_manager.cc b/src/window_manager.cc
@@ -114,8 +114,8 @@ static ButtonGroup gButtonGroups[BUTTON_GROUP_LIST_CAPACITY];
 int windowManagerInit(VideoSystemInitProc* videoSystemInitProc, VideoSystemExitProc* videoSystemExitProc, int a3)
 {
 #ifdef _WIN32
-    CloseHandle(_GNW95_mutex);
-    _GNW95_mutex = INVALID_HANDLE_VALUE;
+    CloseHandle(GNW95_mutex);
+    GNW95_mutex = INVALID_HANDLE_VALUE;
 #endif
 
     if (_GNW95_already_running) {