From dd5f1338c59586b34f9c51a1be2a62dd45bf13e5 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 19 May 2019 20:00:17 +0000 Subject: [PATCH] Revert "Improve file loading" This reverts commit bfc6b7589e8238351986499fb830c7ab274344bc. git-svn-id: https://svn.eduke32.com/eduke32@7678 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/tiles.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/source/build/src/tiles.cpp b/source/build/src/tiles.cpp index f14c19617..ebab97897 100644 --- a/source/build/src/tiles.cpp +++ b/source/build/src/tiles.cpp @@ -292,6 +292,22 @@ int32_t artReadHeader(buildvfs_kfd const fil, char const * const fn, artheader_t { 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);