From 65c1874b3ea4e58446711cb5f741691bcf2061c8 Mon Sep 17 00:00:00 2001 From: zt147369 Date: Wed, 10 Apr 2024 09:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E7=9B=B8=E5=90=8C=E7=9A=84re?= =?UTF-8?q?sfile=E5=92=8Crawfile=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zt147369 --- include/resource_data.h | 2 +- src/resource_pack.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/resource_data.h b/include/resource_data.h index 14ec2d3..459a853 100644 --- a/include/resource_data.h +++ b/include/resource_data.h @@ -39,7 +39,7 @@ const static std::string NEW_LINE_PATH = "\nat "; const static std::string LONG_PATH_HEAD = "\\\\?\\"; const static int32_t VERSION_MAX_LEN = 128; const static int32_t INT_TO_BYTES = sizeof(uint32_t); -static const int8_t RESTOOL_VERSION[VERSION_MAX_LEN] = { "Restool 5.007" }; +static const int8_t RESTOOL_VERSION[VERSION_MAX_LEN] = { "Restool 5.008" }; const static int32_t TAG_LEN = 4; enum class KeyType { diff --git a/src/resource_pack.cpp b/src/resource_pack.cpp index fc94d34..1d21e7d 100644 --- a/src/resource_pack.cpp +++ b/src/resource_pack.cpp @@ -295,6 +295,7 @@ uint32_t ResourcePack::CopyRawFileOrResFileImpl(const string &src, const string } } else { if (ResourceUtil::FileExist(subPath)) { + cerr << "Warning: '" << entry->GetFilePath().GetPath() << "' is defined repeatedly." << endl; continue; } if (!ResourceUtil::CopyFleInner(entry->GetFilePath().GetPath(), subPath)) {