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

Improved map format tests

Browse Source
This commit is contained in:
AlexVinS
2017-08-03 13:50:54 +03:00
parent c5aa403197
commit 12b42f4495
9 changed files with 209 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapping/MapFormatJson.cpp
View File

@@ -1244,7 +1244,7 @@ void CMapSaverJson::writeHeader()
addToArchive(header, HEADER_FILE_NAME);
}
const std::string CMapSaverJson::writeTerrainTile(const TerrainTile & tile)
std::string CMapSaverJson::writeTerrainTile(const TerrainTile & tile)
{
using namespace TerrainDetail;

9
lib/mapping/MapFormatJson.h
View File

@@ -165,8 +165,6 @@ public:
*/
std::unique_ptr<CMapHeader> loadMapHeader() override;
private:
struct MapObjectLoader
{
MapObjectLoader(CMapLoaderJson * _owner, JsonMap::value_type & json);
@@ -193,7 +191,7 @@ private:
*/
void readMap();
void readTerrainTile(const std::string & src, TerrainTile & tile);
static void readTerrainTile(const std::string & src, TerrainTile & tile);
void readTerrainLevel(const JsonNode & src, const int index);
@@ -206,6 +204,7 @@ private:
JsonNode getFromArchive(const std::string & archiveFilename);
private:
CInputStream * buffer;
std::shared_ptr<CIOApi> ioApi;
@@ -228,7 +227,6 @@ public:
* Actually saves the VCMI/Json map into stream.
*/
void saveMap(const std::unique_ptr<CMap> & map) override;
private:
/**
* Saves @data as json file with specified @filename
@@ -244,7 +242,7 @@ private:
* Encodes one tile into string
* @param tile tile to serialize
*/
const std::string writeTerrainTile(const TerrainTile & tile);
static std::string writeTerrainTile(const TerrainTile & tile);
/**
* Saves map level into json
@@ -262,6 +260,7 @@ private:
*/
void writeObjects();
private:
CInputOutputStream * buffer;
std::shared_ptr<CIOApi> ioApi;
CZipSaver saver;///< object to handle zip archive operations