summaryrefslogtreecommitdiff
path: root/StormLib/src/SBaseCommon.cpp
diff options
context:
space:
mode:
authorGaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>2022-08-15 04:57:24 +0200
committerGitHub <noreply@github.com>2022-08-14 22:57:24 -0400
commit68e7f2e6c16e4b5206e5e1594ec598109bd5a314 (patch)
tree3bf9031f3c8a7559373f9dbf4be2ffe3973d7db9 /StormLib/src/SBaseCommon.cpp
parentb989ef4f7f23acb482ccfc93675c1807b85c4ac0 (diff)
Wii U support (#1097)
* Wii U support * [WiiU] Combined Dockerfile * [WiiU] Combined Dockerfile * [WiiU] Combined Dockerfile * Add Jenkins support * wiiu: fix scissor clamp * wiiu: improve button remapping * wiiu: fix scaling issues * Update Dockerfile after merge * Pull assets before build * Only stop container once * Adjust logging sinks * wiiu: Change button mapping to match PC version * wiiu: Implement controller changes * wiiu: Update BUILDING.md Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Co-authored-by: David Chavez <david@dcvz.io>
Diffstat (limited to 'StormLib/src/SBaseCommon.cpp')
-rw-r--r--StormLib/src/SBaseCommon.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/StormLib/src/SBaseCommon.cpp b/StormLib/src/SBaseCommon.cpp
index e8b3ef182..79ae4b9b5 100644
--- a/StormLib/src/SBaseCommon.cpp
+++ b/StormLib/src/SBaseCommon.cpp
@@ -2005,7 +2005,7 @@ void ConvertTMPQHeader(void *header, uint16_t version)
TMPQHeader * theHeader = (TMPQHeader *)header;
// Swap header part version 1
- if(version == MPQ_FORMAT_VERSION_1)
+ if(version >= MPQ_FORMAT_VERSION_1)
{
theHeader->dwID = SwapUInt32(theHeader->dwID);
theHeader->dwHeaderSize = SwapUInt32(theHeader->dwHeaderSize);
@@ -2018,21 +2018,21 @@ void ConvertTMPQHeader(void *header, uint16_t version)
theHeader->dwBlockTableSize = SwapUInt32(theHeader->dwBlockTableSize);
}
- if(version == MPQ_FORMAT_VERSION_2)
+ if(version >= MPQ_FORMAT_VERSION_2)
{
theHeader->HiBlockTablePos64 = SwapUInt64(theHeader->HiBlockTablePos64);
theHeader->wHashTablePosHi = SwapUInt16(theHeader->wHashTablePosHi);
theHeader->wBlockTablePosHi = SwapUInt16(theHeader->wBlockTablePosHi);
}
- if(version == MPQ_FORMAT_VERSION_3)
+ if(version >= MPQ_FORMAT_VERSION_3)
{
theHeader->ArchiveSize64 = SwapUInt64(theHeader->ArchiveSize64);
theHeader->BetTablePos64 = SwapUInt64(theHeader->BetTablePos64);
theHeader->HetTablePos64 = SwapUInt64(theHeader->HetTablePos64);
}
- if(version == MPQ_FORMAT_VERSION_4)
+ if(version >= MPQ_FORMAT_VERSION_4)
{
theHeader->HashTableSize64 = SwapUInt64(theHeader->HashTableSize64);
theHeader->BlockTableSize64 = SwapUInt64(theHeader->BlockTableSize64);