games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-24 00:36:29 +02:00
Code Issues Releases Activity

Advance map format simple test

Browse Source
This commit is contained in:
AlexVinS
2015-08-08 19:16:33 +03:00
committed by AlexVinS
parent 7d16585f89
commit 0cc47f00c5
6 changed files with 69 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mapping/MapFormatJson.cpp
View File

@@ -110,10 +110,9 @@ CMapLoaderJson::CMapLoaderJson(CInputStream * stream):
std::unique_ptr<CMap> CMapLoaderJson::loadMap()
{
map = new CMap();
mapHeader.reset(map);
mapHeader = std::unique_ptr<CMapHeader>(dynamic_cast<CMapHeader *>(map));
readMap();
mapHeader.reset();
return std::unique_ptr<CMap>(map);
return std::unique_ptr<CMap>(dynamic_cast<CMap *>(mapHeader.release()));
}
std::unique_ptr<CMapHeader> CMapLoaderJson::loadMapHeader()
@@ -167,7 +166,7 @@ JsonNode eventToJson(const EventCondition & cond)
void CMapLoaderJson::readMap()
{
readHeader();
assert(0); // Not implemented, vcmi does not have its own map format right now
//TODO:readMap
}
void CMapLoaderJson::readHeader()
@@ -175,12 +174,12 @@ void CMapLoaderJson::readHeader()
//TODO: read such data like map name & size
// readTriggeredEvents();
readPlayerInfo();
assert(0); // Not implemented
//TODO: readHeader
}
void CMapLoaderJson::readPlayerInfo()
{
assert(0); // Not implemented
//TODO: readPlayerInfo
}
///CMapSaverJson
@@ -193,6 +192,6 @@ CMapSaverJson::CMapSaverJson(COutputStream * stream):
void CMapSaverJson::saveMap(const std::unique_ptr<CMap>& map)
{
assert(0); // Not implemented
//TODO: saveMap
}