Fix debug print on non-Windows platforms and Quick-save message (#400)

alexbatalov · Jan 12, 2025 · 5956227 · 5956227
1 parent f443e36
commit 5956227
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/debug.cc b/src/debug.cc
@@ -138,7 +138,7 @@ int debugPrint(const char* format, ...)
 
         rc = gDebugPrintProc(string);
     } else {
-#ifdef _DEBUG
+#ifndef NDEBUG
         SDL_LogMessageV(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, format, args);
 #endif
         rc = -1;

diff --git a/src/loadsave.cc b/src/loadsave.cc
@@ -390,6 +390,16 @@ int lsgSaveGame(int mode)
             fileClose(_flptr);
         }
 
+        if (!messageListInit(&gLoadSaveMessageList)) {
+            return -1;
+        }
+
+        char path[COMPAT_MAX_PATH];
+        snprintf(path, sizeof(path), "%s%s", asc_5186C8, "LSGAME.MSG");
+        if (!messageListLoad(&gLoadSaveMessageList, path)) {
+            return -1;
+        }
+
         _snapshotBuf = nullptr;
         int v6 = _QuickSnapShot();
         if (v6 == 1) {
@@ -409,16 +419,6 @@ int lsgSaveGame(int mode)
             return 1;
         }
 
-        if (!messageListInit(&gLoadSaveMessageList)) {
-            return -1;
-        }
-
-        char path[COMPAT_MAX_PATH];
-        snprintf(path, sizeof(path), "%s%s", asc_5186C8, "LSGAME.MSG");
-        if (!messageListLoad(&gLoadSaveMessageList, path)) {
-            return -1;
-        }
-
         soundPlayFile("iisxxxx1");
 
         // Error saving game!