incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' of https://codeberg.org/NepDisk/blankart into next

Browse source
This commit is contained in:
minenice55 2026-04-26 16:13:22 -04:00
commit 4e47388191
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -183,8 +183,10 @@ if("${BLANKART_EXE_NAME}" STREQUAL "")
list(APPEND EXE_NAME_PARTS ${SRB2_GIT_BRANCH}) list(APPEND EXE_NAME_PARTS ${SRB2_GIT_BRANCH})
endif() endif()
string(TOLOWER "${CMAKE_BUILD_TYPE}" BLDTYPE_READOUT) if(NOT "${NOAPPENDBUILD}")
list(APPEND EXE_NAME_PARTS ${BLDTYPE_READOUT}) 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") if(SRB2_CONFIG_COMPILEAPPIMAGE AND "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
list(APPEND EXE_NAME_PARTS "appimagebuild") list(APPEND EXE_NAME_PARTS "appimagebuild")

6
src/w_wad.c
View file

@ -1340,7 +1340,11 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
if (!TestValidLump(wad, 0)) if (!TestValidLump(wad, 0))
return INT16_MAX; 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 hash = W_HashLumpName(name, namelen); // Not a mistake, legacy system for short lumpnames
// //