games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Update to c++17

Browse Source
This commit is contained in:
Ivan Savenko
2023-04-15 17:20:19 +03:00
parent 5589e973a8
commit 65e4ce9ffe
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mapping/MapFormatH3M.cpp
View File

@@ -138,9 +138,8 @@ void CMapLoaderH3M::readHeader()
if(hotaVersion > 1) if(hotaVersion > 1)
{ {
uint8_t unknown = reader->readUInt32(); [[maybe_unused]] uint8_t unknown = reader->readUInt32();
assert(unknown == 12); assert(unknown == 12);
MAYBE_UNUSED(unknown);
} }
} }
else else
@@ -648,9 +647,11 @@ void CMapLoaderH3M::readMapOptions()
if(features.levelHOTA1) if(features.levelHOTA1)
{ {
uint8_t unknownConstant = reader->readUInt8(); // Unknown, may be another "sized bitmap", e.g
// 4 bytes - size of bitmap (16)
// 2 bytes - bitmap data (16 bits / 2 bytes)
[[maybe_unused]] uint8_t unknownConstant = reader->readUInt8();
assert(unknownConstant == 16); assert(unknownConstant == 16);
MAYBE_UNUSED(unknownConstant);
reader->skipZero(5); reader->skipZero(5);
} }
@@ -2041,8 +2042,7 @@ CGObjectInstance * CMapLoaderH3M::readTown(const int3 & position, std::shared_pt
if(features.levelHOTA1) if(features.levelHOTA1)
{ {
// TODO: HOTA support // TODO: HOTA support
bool spellResearchAvailable = reader->readBool(); [[maybe_unused]] bool spellResearchAvailable = reader->readBool();
MAYBE_UNUSED(spellResearchAvailable);
} }
// Read castle events // Read castle events