diff options
| author | Ladislav Zezula <zezula@volny.cz> | 2020-10-26 08:11:00 +0100 |
|---|---|---|
| committer | Ladislav Zezula <zezula@volny.cz> | 2020-10-26 08:11:00 +0100 |
| commit | f3560fa9af389d9b8be09b4e90f668fc22ed531f (patch) | |
| tree | b6352136f402f3962d8b56cca5cccd1c7346a29f /src/StormLib.h | |
| parent | ece4f1ad6630f339ed02caa859851e66a96b5f33 (diff) | |
Name conflict with Unreal Engine 4: TBitArray
Diffstat (limited to 'src/StormLib.h')
| -rw-r--r-- | src/StormLib.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/StormLib.h b/src/StormLib.h index 3a52a65..4f19772 100644 --- a/src/StormLib.h +++ b/src/StormLib.h @@ -480,7 +480,7 @@ typedef void (WINAPI * SFILE_ADDFILE_CALLBACK)(void * pvUserData, DWORD dwBytesW typedef void (WINAPI * SFILE_COMPACT_CALLBACK)(void * pvUserData, DWORD dwWorkType, ULONGLONG BytesProcessed, ULONGLONG TotalBytes); struct TFileStream; -class TBitArray; +struct TStormBits; //----------------------------------------------------------------------------- // Structures related to MPQ format @@ -748,7 +748,7 @@ typedef struct _TMPQBetHeader // Structure for parsed HET table typedef struct _TMPQHetTable { - TBitArray * pBetIndexes; // Bit array of FileIndex values + TStormBits * pBetIndexes; // Bit array of FileIndex values LPBYTE pNameHashes; // Array of NameHash1 values (NameHash1 = upper 8 bits of FileName hashe) ULONGLONG AndMask64; // AND mask used for calculating file name hash ULONGLONG OrMask64; // OR mask used for setting the highest bit of the file name hash @@ -764,8 +764,8 @@ typedef struct _TMPQHetTable // Structure for parsed BET table typedef struct _TMPQBetTable { - TBitArray * pNameHashes; // Array of NameHash2 entries (lower 24 bits of FileName hash) - TBitArray * pFileTable; // Bit-based file table + TStormBits * pNameHashes; // Array of NameHash2 entries (lower 24 bits of FileName hash) + TStormBits * pFileTable; // Bit-based file table LPDWORD pFileFlags; // Array of file flags DWORD dwTableEntrySize; // Size of one table entry, in bits |