Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.3.4

1 files changed, 35 insertions, 35 deletions

diff --git a/dep/StormLib/src/SBaseDumpData.cpp b/dep/StormLib/src/SBaseDumpData.cpp
index f2b5fad1e8f..c9dcf0a3366 100644
--- a/dep/StormLib/src/SBaseDumpData.cpp
+++ b/dep/StormLib/src/SBaseDumpData.cpp
@@ -17,18 +17,18 @@
 void DumpMpqHeader(TMPQHeader * pHeader)
 {
     printf("== MPQ Header =================================\n");
-    printf("DWORD dwID                   = %08lX\n",     pHeader->dwID);
-    printf("DWORD dwHeaderSize           = %08lX\n",     pHeader->dwHeaderSize);
-    printf("DWORD dwArchiveSize          = %08lX\n",     pHeader->dwArchiveSize);
-    printf("USHORT wFormatVersion        = %04lX\n",     pHeader->wFormatVersion);
-    printf("USHORT wSectorSize           = %04lX\n",     pHeader->wSectorSize);
-    printf("DWORD dwHashTablePos         = %08lX\n",     pHeader->dwHashTablePos);
-    printf("DWORD dwBlockTablePos        = %08lX\n",     pHeader->dwBlockTablePos);
-    printf("DWORD dwHashTableSize        = %08lX\n",     pHeader->dwHashTableSize);
-    printf("DWORD dwBlockTableSize       = %08lX\n",     pHeader->dwBlockTableSize);
+    printf("DWORD dwID                   = %08X\n",    pHeader->dwID);
+    printf("DWORD dwHeaderSize           = %08X\n",    pHeader->dwHeaderSize);
+    printf("DWORD dwArchiveSize          = %08X\n",    pHeader->dwArchiveSize);
+    printf("USHORT wFormatVersion        = %04X\n",    pHeader->wFormatVersion);
+    printf("USHORT wSectorSize           = %04X\n",    pHeader->wSectorSize);
+    printf("DWORD dwHashTablePos         = %08X\n",    pHeader->dwHashTablePos);
+    printf("DWORD dwBlockTablePos        = %08X\n",    pHeader->dwBlockTablePos);
+    printf("DWORD dwHashTableSize        = %08X\n",    pHeader->dwHashTableSize);
+    printf("DWORD dwBlockTableSize       = %08X\n",    pHeader->dwBlockTableSize);
     printf("ULONGLONG HiBlockTablePos64  = %016llX\n", pHeader->HiBlockTablePos64);
-    printf("USHORT wHashTablePosHi       = %04lX\n",     pHeader->wHashTablePosHi);
-    printf("USHORT wBlockTablePosHi      = %04lX\n",     pHeader->wBlockTablePosHi);
+    printf("USHORT wHashTablePosHi       = %04X\n",    pHeader->wHashTablePosHi);
+    printf("USHORT wBlockTablePosHi      = %04X\n",    pHeader->wBlockTablePosHi);
     printf("ULONGLONG ArchiveSize64      = %016llX\n", pHeader->ArchiveSize64);
     printf("ULONGLONG BetTablePos64      = %016llX\n", pHeader->BetTablePos64);
     printf("ULONGLONG HetTablePos64      = %016llX\n", pHeader->HetTablePos64);
@@ -37,7 +37,7 @@ void DumpMpqHeader(TMPQHeader * pHeader)
     printf("ULONGLONG HiBlockTableSize64 = %016llX\n", pHeader->HiBlockTableSize64);
     printf("ULONGLONG HetTableSize64     = %016llX\n", pHeader->HetTableSize64);
     printf("ULONGLONG BetTableSize64     = %016llX\n", pHeader->BetTableSize64);
-    printf("DWORD dwRawChunkSize         = %08lX\n",     pHeader->dwRawChunkSize);
+    printf("DWORD dwRawChunkSize         = %08X\n",     pHeader->dwRawChunkSize);
     printf("-----------------------------------------------\n\n");
 }
 
@@ -51,31 +51,31 @@ void DumpHetAndBetTable(TMPQHetTable * pHetTable, TMPQBetTable * pBetTable)
     printf("== HET Header =================================\n");
     printf("ULONGLONG  AndMask64         = %016llX\n", pHetTable->AndMask64);       
     printf("ULONGLONG  OrMask64          = %016llX\n", pHetTable->OrMask64);        
-    printf("DWORD      dwIndexSizeTotal  = %08lX\n",     pHetTable->dwIndexSizeTotal);
-    printf("DWORD      dwIndexSizeExtra  = %08lX\n",     pHetTable->dwIndexSizeExtra);
-    printf("DWORD      dwIndexSize       = %08lX\n",     pHetTable->dwIndexSize);     
-    printf("DWORD      dwMaxFileCount    = %08lX\n",     pHetTable->dwMaxFileCount);  
-    printf("DWORD      dwHashTableSize   = %08lX\n",     pHetTable->dwHashTableSize); 
-    printf("DWORD      dwHashBitSize     = %08lX\n",     pHetTable->dwHashBitSize);   
+    printf("DWORD      dwIndexSizeTotal  = %08X\n",     pHetTable->dwIndexSizeTotal);
+    printf("DWORD      dwIndexSizeExtra  = %08X\n",     pHetTable->dwIndexSizeExtra);
+    printf("DWORD      dwIndexSize       = %08X\n",     pHetTable->dwIndexSize);     
+    printf("DWORD      dwMaxFileCount    = %08X\n",     pHetTable->dwMaxFileCount);  
+    printf("DWORD      dwHashTableSize   = %08X\n",     pHetTable->dwHashTableSize); 
+    printf("DWORD      dwHashBitSize     = %08X\n",     pHetTable->dwHashBitSize);   
     printf("-----------------------------------------------\n\n");
 
     printf("== BET Header =================================\n");
-    printf("DWORD dwTableEntrySize       = %08lX\n",     pBetTable->dwTableEntrySize);
-    printf("DWORD dwBitIndex_FilePos     = %08lX\n",     pBetTable->dwBitIndex_FilePos);
-    printf("DWORD dwBitIndex_FileSize    = %08lX\n",     pBetTable->dwBitIndex_FileSize);
-    printf("DWORD dwBitIndex_CmpSize     = %08lX\n",     pBetTable->dwBitIndex_CmpSize);
-    printf("DWORD dwBitIndex_FlagIndex   = %08lX\n",     pBetTable->dwBitIndex_FlagIndex);
-    printf("DWORD dwBitIndex_Unknown     = %08lX\n",     pBetTable->dwBitIndex_Unknown);
-    printf("DWORD dwBitCount_FilePos     = %08lX\n",     pBetTable->dwBitCount_FilePos);
-    printf("DWORD dwBitCount_FileSize    = %08lX\n",     pBetTable->dwBitCount_FileSize);
-    printf("DWORD dwBitCount_CmpSize     = %08lX\n",     pBetTable->dwBitCount_CmpSize);
-    printf("DWORD dwBitCount_FlagIndex   = %08lX\n",     pBetTable->dwBitCount_FlagIndex);   
-    printf("DWORD dwBitCount_Unknown     = %08lX\n",     pBetTable->dwBitCount_Unknown);
-    printf("DWORD dwBetHashSizeTotal     = %08lX\n",     pBetTable->dwBetHashSizeTotal);
-    printf("DWORD dwBetHashSizeExtra     = %08lX\n",     pBetTable->dwBetHashSizeExtra);
-    printf("DWORD dwBetHashSize          = %08lX\n",     pBetTable->dwBetHashSize);
-    printf("DWORD dwMaxFileCount         = %08lX\n",     pBetTable->dwMaxFileCount);
-    printf("DWORD dwFlagCount            = %08lX\n",     pBetTable->dwFlagCount);
+    printf("DWORD dwTableEntrySize       = %08X\n",     pBetTable->dwTableEntrySize);
+    printf("DWORD dwBitIndex_FilePos     = %08X\n",     pBetTable->dwBitIndex_FilePos);
+    printf("DWORD dwBitIndex_FileSize    = %08X\n",     pBetTable->dwBitIndex_FileSize);
+    printf("DWORD dwBitIndex_CmpSize     = %08X\n",     pBetTable->dwBitIndex_CmpSize);
+    printf("DWORD dwBitIndex_FlagIndex   = %08X\n",     pBetTable->dwBitIndex_FlagIndex);
+    printf("DWORD dwBitIndex_Unknown     = %08X\n",     pBetTable->dwBitIndex_Unknown);
+    printf("DWORD dwBitCount_FilePos     = %08X\n",     pBetTable->dwBitCount_FilePos);
+    printf("DWORD dwBitCount_FileSize    = %08X\n",     pBetTable->dwBitCount_FileSize);
+    printf("DWORD dwBitCount_CmpSize     = %08X\n",     pBetTable->dwBitCount_CmpSize);
+    printf("DWORD dwBitCount_FlagIndex   = %08X\n",     pBetTable->dwBitCount_FlagIndex);   
+    printf("DWORD dwBitCount_Unknown     = %08X\n",     pBetTable->dwBitCount_Unknown);
+    printf("DWORD dwBetHashSizeTotal     = %08X\n",     pBetTable->dwBetHashSizeTotal);
+    printf("DWORD dwBetHashSizeExtra     = %08X\n",     pBetTable->dwBetHashSizeExtra);
+    printf("DWORD dwBetHashSize          = %08X\n",     pBetTable->dwBetHashSize);
+    printf("DWORD dwMaxFileCount         = %08X\n",     pBetTable->dwMaxFileCount);
+    printf("DWORD dwFlagCount            = %08X\n",     pBetTable->dwFlagCount);
     printf("-----------------------------------------------\n\n");
 
     printf("== HET & Bet Table ======================================================================\n\n");
@@ -128,7 +128,7 @@ void DumpHetAndBetTable(TMPQHetTable * pHetTable, TMPQBetTable * pBetTable)
             dwFlags = pBetTable->pFileFlags[dwFlagIndex];
         }
 
-        printf(" %04lX    %02lX     %04lX  %016llX %016llX %08lX %08lX  %04lX  %08lX\n", i,
+        printf(" %04X    %02lX     %04X  %016llX %016llX %08X %08X  %04X  %08X\n", i,
                                                          pHetTable->pHetHashes[i],
                                                          dwBetIndex,
                                                          BetHash,