From fb1197925a0c0e138a087b5ff2ee502ef99753f5 Mon Sep 17 00:00:00 2001 From: Zezula Ladislav Date: Fri, 17 May 2019 09:22:09 +0200 Subject: [PATCH] Linux Build: In progress --- src/CascStructs.h | 4 ++-- src/common/ListFile.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CascStructs.h b/src/CascStructs.h index 9836326e..b2925ec8 100644 --- a/src/CascStructs.h +++ b/src/CascStructs.h @@ -91,7 +91,7 @@ typedef struct _FILE_EKEY_ENTRY // https://wowdev.wiki/TACT#Encoding_table // -#define FILE_MAGIC_ENCODING 'NE' +#define FILE_MAGIC_ENCODING 0x4E45 // 'EN' // File header of the ENCODING manifest typedef struct _FILE_ENCODING_HEADER @@ -141,7 +141,7 @@ typedef struct _FILE_ESPEC_ENTRY // See https://wowdev.wiki/TACT#Download_manifest // -#define FILE_MAGIC_DOWNLOAD 'LD' +#define FILE_MAGIC_DOWNLOAD 0x4C44 // 'DL' // File header of the DOWNLOAD manifest typedef struct _FILE_DOWNLOAD_HEADER diff --git a/src/common/ListFile.cpp b/src/common/ListFile.cpp index 811f269b..35731183 100644 --- a/src/common/ListFile.cpp +++ b/src/common/ListFile.cpp @@ -88,7 +88,7 @@ static int ListFile_GetFileDataId(PLISTFILE_CACHE pCache, PDWORD PtrFileDataId) DWORD dwInt32 = 0; // Set the limit for loading the number - szLineEnd = min((szLineBegin + 20), pCache->pEnd); + szLineEnd = CASCLIB_MIN((szLineBegin + 20), pCache->pEnd); // Extract decimal digits from the string while(szLineBegin < szLineEnd && '0' <= szLineBegin[0] && szLineBegin[0] <= '9')