From 8c698c61d4056429c3fc5ea7009d7cc4703f25ce Mon Sep 17 00:00:00 2001 From: yamamama Date: Sun, 26 Apr 2026 06:23:19 -0400 Subject: [PATCH 1/2] NOAPPENDBUILD An option to toggle off the build type suffix, mainly for more public-facing releases (try saying blankart_relwithdebinfo out loud!) --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae637e889..761bdaa97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,8 +183,10 @@ if("${BLANKART_EXE_NAME}" STREQUAL "") list(APPEND EXE_NAME_PARTS ${SRB2_GIT_BRANCH}) endif() - string(TOLOWER "${CMAKE_BUILD_TYPE}" BLDTYPE_READOUT) - list(APPEND EXE_NAME_PARTS ${BLDTYPE_READOUT}) + if(NOT "${NOAPPENDBUILD}") + string(TOLOWER "${CMAKE_BUILD_TYPE}" BLDTYPE_READOUT) + list(APPEND EXE_NAME_PARTS ${BLDTYPE_READOUT}) + endif() if(SRB2_CONFIG_COMPILEAPPIMAGE AND "${CMAKE_SYSTEM_NAME}" MATCHES "Linux") list(APPEND EXE_NAME_PARTS "appimagebuild") From a1ba38b882dc3a48339a1b5e8178352d9c1bd89f Mon Sep 17 00:00:00 2001 From: yamamama Date: Sun, 26 Apr 2026 07:45:48 -0400 Subject: [PATCH 2/2] Truncate shortname checks so names past the 8-character limit still get picked up Missed a spot with the WAD search optimizations, it seems... --- src/w_wad.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/w_wad.c b/src/w_wad.c index 10b285644..bca038ca7 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1340,7 +1340,11 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump) if (!TestValidLump(wad, 0)) return INT16_MAX; - namelen = strlen(name); + // Name = SHORTNAME. Truncate/move the string to something that has a max of 8 characters. + // Will this cause lumpname/lumphash collisions? Of course it will! But we need it for + // SRB2Kart compatibility, so... + namelen = min(strlen(name), 8); + hash = W_HashLumpName(name, namelen); // Not a mistake, legacy system for short lumpnames //