From b78d3bb0a8d85c2f8ea1eea346d5ee35471aaaaf Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 22 Jan 2024 23:18:53 +0300 Subject: [PATCH] Force postload for autoloaded character addons --- src/d_main.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index 3850243b8..0f8d7b1df 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -968,7 +968,8 @@ static void D_FindAddonsToAutoload(void) const char *autoloadpath; boolean postload; - INT32 i; + INT32 i, len; + boolean hasprefix = false; char wadsToAutoload[256] = "", renameAutoloadStrings[256] = ""; // does it exist tho @@ -999,6 +1000,36 @@ static void D_FindAddonsToAutoload(void) wadsToAutoload[i] = '\0'; } + len = strlen(wadsToAutoload); + hasprefix = false; + + for (i = 0; i < len; ++i) + { + if (wadsToAutoload[i] == '_') + { + hasprefix = true; + break; + } + } + + // Lets just hope no one adds bonuschars in autoload + if (hasprefix) + { + // We searching for c in prefix, which stands for "character" and doesn't work well with + // autoload atm, only fine for postload + for (i = 0; i < len; ++i) + { + if (wadsToAutoload[i] == '_') break; // Prefix end + + if (wadsToAutoload[i] == 'c' || wadsToAutoload[i] == 'C') + { + CONS_Alert(CONS_WARNING, "forcing postload for %s as local skin\n", wadsToAutoload); + postload = true; + break; // Found it + } + } + } + // LOAD IT if (!postload) D_AutoloadFile(wadsToAutoload, autoloadwadfiles);