From 36c2c1711e75ffd40fd1d78792e5eefb63cc9def Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 28 Jun 2026 16:23:16 +0200 Subject: [PATCH] block "addfilelocal" from adding files that contains maps now we have a more accessible menu for addfile local i really dont want to risk stuff --- src/d_main.c | 2 +- src/p_setup.c | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index eda604adb..8d6127cb6 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1269,7 +1269,7 @@ static void D_FindAddonsToAutoload(void) // you can probably imagine how that goes in a netgame.... if (W_CheckAutoLoadContainsMap(wadsToAutoload)) { - CONS_Printf("Autoload: file %s contains map data! skipping...", wadsToAutoload); + CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload); continue; } diff --git a/src/p_setup.c b/src/p_setup.c index 915ad4430..fded8c003 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3341,6 +3341,17 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local) sreplaces = mreplaces = digmreplaces = 0; + if (local) + { + // check if someone tries to load maps locally lol + // do this here so we can skip loading the file anyways + if (W_CheckAutoLoadContainsMap(wadfilename)) + { + CONS_Alert(CONS_WARNING, "addilelocal: locally added file %s contains map data, this WILL cause crashes and desynchs! not added.\n", wadfilename); + return UINT16_MAX; + } + } + if ((numlumps = W_InitFile(wadfilename, local, false)) == INT16_MAX) { refreshdirmenu |= REFRESHDIR_NOTLOADED; @@ -3371,12 +3382,15 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local) allvotereplaced = true; } - if (!devparm && sreplaces) - CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces)); - if (!devparm && mreplaces) - CONS_Printf(M_GetText("%s midi musics ignored\n"), sizeu1(mreplaces)); - if (!devparm && digmreplaces) - CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces)); + if (!devparm) + { + if (sreplaces) + CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces)); + if (mreplaces) + CONS_Printf(M_GetText("%s midi musics ignored\n"), sizeu1(mreplaces)); + if (digmreplaces) + CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces)); + } if (!mapsadded) CONS_Printf(M_GetText("No maps added\n"));