From 985220063cd4231636b0d6565d824f1cad7517c6 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:58:09 -0400 Subject: [PATCH] modding: Adjust mod mount failure logging --- src/modding.cpp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/modding.cpp b/src/modding.cpp index 4e8d76e620f..656b6915f93 100644 --- a/src/modding.cpp +++ b/src/modding.cpp @@ -143,7 +143,29 @@ size_t addSubdirs(const char *basedir, const char *subdir, const bool appendToPa else { // failed to mount mod - debug(LOG_WZ, "Failed to load mod from path: %s, %s", tmpFullModRealPath.c_str(), WZ_PHYSFS_getLastError()); + code_part log_level = LOG_WZ; +#if defined(WZ_PHYSFS_2_1_OR_GREATER) + auto errorCode = PHYSFS_getLastErrorCode(); + switch (errorCode) + { + case PHYSFS_ERR_CORRUPT: + log_level = LOG_ERROR; + break; + case PHYSFS_ERR_NOT_FOUND: + default: + log_level = LOG_WZ; + break; + } + const char* pErrStr = PHYSFS_getErrorByCode(errorCode); +#else + const char* pErrStr = WZ_PHYSFS_getLastError(); +#endif + if (!pErrStr) + { + pErrStr = ""; + } + debug(log_level, "Failed to load mod from path: %s, %s", tmpFullModRealPath.c_str(), pErrStr); + } } return true; // continue