From 05c84e6cf2b64f91fdb8e44bcdab9b03768d80cc Mon Sep 17 00:00:00 2001 From: Brad Harding Date: Fri, 13 Sep 2024 20:05:06 +1000 Subject: [PATCH] Indicate ID24 compatibility in `mapstats` CCMD --- src/c_cmds.c | 9 +++++---- src/d_main.c | 2 ++ src/p_setup.c | 1 + src/r_state.h | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/c_cmds.c b/src/c_cmds.c index e02552401..1a745d065 100644 --- a/src/c_cmds.c +++ b/src/c_cmds.c @@ -5201,10 +5201,11 @@ static void mapstats_func2(char *cmd, char *parms) } C_TabbedOutput(tabs, "Compatibility\t%s", - (mbf21compatible ? ITALICS("MBF21") : - (mbfcompatible ? ITALICS("MBF") : - (boomcompatible ? ITALICS("BOOM") : - (numsegs < 32768 ? "Vanilla" : "Limit removing"))))); + (id24compatible ? ITALICS("ID24") : + (mbf21compatible ? ITALICS("MBF21") : + (mbfcompatible ? ITALICS("MBF") : + (boomcompatible ? ITALICS("BOOM") : + (numsegs < 32768 ? "Vanilla" : "Limit removing")))))); if (partime) C_TabbedOutput(tabs, "Par time\t" MONOSPACED("%02i") ":" MONOSPACED("%02i"), diff --git a/src/d_main.c b/src/d_main.c index 4d45465c0..fce28d4d4 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -2446,6 +2446,8 @@ static void D_DoomMainSetup(void) W_CheckForPNGLumps(); + id24compatible = (W_CheckNumForName("SBARDEF") >= 0 || W_CheckNumForName("SKYDEFS") >= 0); + FREEDM = (W_CheckNumForName("FREEDM") >= 0); PLAYPALs = (FREEDOOM || chex || hacx || harmony || REKKRSA ? 2 : W_GetNumLumps("PLAYPAL")); diff --git a/src/p_setup.c b/src/p_setup.c index 63453c3a0..e55aa265c 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -383,6 +383,7 @@ const char *nodeformats[] = }; bool boomcompatible; +bool id24compatible = false; bool mbfcompatible; bool mbf21compatible = false; bool blockmaprebuilt; diff --git a/src/r_state.h b/src/r_state.h index c2812e12e..357f23c8b 100644 --- a/src/r_state.h +++ b/src/r_state.h @@ -121,6 +121,7 @@ extern nodeformat_t nodeformat; extern const char *nodeformats[]; extern bool boomcompatible; +extern bool id24compatible; extern bool mbfcompatible; extern bool mbf21compatible; extern bool blockmaprebuilt;