From 5956227dcb520edd9e5a6aaf48643238d234874a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0imek?= Date: Mon, 13 Jan 2025 00:33:14 +0100 Subject: [PATCH] Fix debug print on non-Windows platforms and Quick-save message (#400) --- src/debug.cc | 2 +- src/loadsave.cc | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/debug.cc b/src/debug.cc index abd96f0..a268853 100644 --- 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 index 3fbe54d..9423db8 100644 --- 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!