From fba53b144acc20bd6718de175171acccbf217a50 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 9 Mar 2018 02:51:24 +0000 Subject: [PATCH] Accept "BUILDART" prepended to ART files git-svn-id: https://svn.eduke32.com/eduke32@6755 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/tiles.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/source/build/src/tiles.cpp b/source/build/src/tiles.cpp index cf2efaffa..5a223f965 100644 --- a/source/build/src/tiles.cpp +++ b/source/build/src/tiles.cpp @@ -287,6 +287,22 @@ int32_t E_ReadArtFileHeader(int32_t const fil, char const * const fn, artheader_ { int32_t artversion; kread(fil, &artversion, 4); artversion = B_LITTLE32(artversion); + + if (artversion == B_LITTLE32(0x4c495542)) + { + kread(fil, &artversion, 4); artversion = B_LITTLE32(artversion); + if (artversion == B_LITTLE32(0x54524144)) + { + kread(fil, &artversion, 4); artversion = B_LITTLE32(artversion); + } + else + { + initprintf("loadpics: Invalid art file, %s\n", fn); + kclose(fil); + return 1; + } + } + if (artversion != 1) { initprintf("loadpics: Invalid art file version in %s\n", fn); @@ -519,7 +535,7 @@ static int32_t E_ReadArtFileOfID(int32_t tilefilei) } else { - int offscount = 4+4+4+4+(local.numtiles<<3); + int offscount = ktell(fil); for (bssize_t i=local.tilestart; i<=local.tileend; ++i) {