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

Fix build

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-10 21:30:12 +02:00
parent ea1f05d15a
commit 9af7c63a26
18 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/map/CMapFormatTest.cpp
View File

@ -62,7 +62,7 @@ TEST(MapFormat, DISABLED_Random)
opt.setPlayerTypeForStandardPlayer(PlayerColor(2), EPlayerType::AI);
opt.setPlayerTypeForStandardPlayer(PlayerColor(3), EPlayerType::AI);
CMapGenerator gen(opt, TEST_RANDOM_SEED);
CMapGenerator gen(opt, nullptr, TEST_RANDOM_SEED);
std::unique_ptr<CMap> initialMap = gen.generate();
initialMap->name.appendRawString("Test");
@ -80,7 +80,7 @@ TEST(MapFormat, DISABLED_Random)
serializeBuffer.seek(0);
{
CMapLoaderJson loader(&serializeBuffer);
std::unique_ptr<CMap> serialized = loader.loadMap();
std::unique_ptr<CMap> serialized = loader.loadMap(nullptr);
MapComparer c;
c(serialized, initialMap);
@ -130,7 +130,7 @@ static std::unique_ptr<CMap> loadOriginal(const JsonNode & header, const JsonNod
CMapLoaderJson initialLoader(&initialBuffer);
return initialLoader.loadMap();
return initialLoader.loadMap(nullptr);
}
static void loadActual(CMemoryBuffer * serializeBuffer, const std::unique_ptr<CMap> & originalMap, JsonNode & header, JsonNode & objects, JsonNode & surface, JsonNode & underground)