games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
AlexVinS 2015-08-20 06:16:31 +03:00 committed by AlexVinS
parent 7c8d29b871
commit 2f67e015e1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapping/MapFormatJson.cpp
View File

@ -424,12 +424,12 @@ void CMapLoaderJson::readTerrainLevel(const JsonNode& src, const int index)
void CMapLoaderJson::readTerrain() void CMapLoaderJson::readTerrain()
{ {
{ {
const JsonNode surface = readJson("surface.json"); const JsonNode surface = readJson("surface_terrain.json");
readTerrainLevel(surface, 0); readTerrainLevel(surface, 0);
} }
if(map->twoLevel) if(map->twoLevel)
{ {
const JsonNode underground = readJson("underground.json"); const JsonNode underground = readJson("underground_terrain.json");
readTerrainLevel(underground, 1); readTerrainLevel(underground, 1);
} }
@ -527,7 +527,7 @@ void CMapSaverJson::writePlayerInfo(JsonNode & output)
const PlayerInfo & info = map->players[player]; const PlayerInfo & info = map->players[player];
if(info.canAnyonePlay()) if(info.canAnyonePlay())
writePlayerInfo(info, dest[GameConstants::PLAYER_COLOR_NAMES[player]); writePlayerInfo(info, dest[GameConstants::PLAYER_COLOR_NAMES[player]]);
} }
} }
@ -584,11 +584,11 @@ void CMapSaverJson::writeTerrain()
//todo: multilevel map save support //todo: multilevel map save support
JsonNode surface = writeTerrainLevel(0); JsonNode surface = writeTerrainLevel(0);
addToArchive(surface, "surface.json"); addToArchive(surface, "surface_terrain.json");
if(map->twoLevel) if(map->twoLevel)
{ {
JsonNode underground = writeTerrainLevel(1); JsonNode underground = writeTerrainLevel(1);
addToArchive(underground, "underground.json"); addToArchive(underground, "underground_terrain.json");
} }
} }

1
lib/mapping/MapFormatJson.h
View File

@ -18,6 +18,7 @@
class TriggeredEvent; class TriggeredEvent;
struct TerrainTile; struct TerrainTile;
struct PlayerInfo;
class DLL_LINKAGE CMapFormatJson class DLL_LINKAGE CMapFormatJson
{ {