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

Prepared JsonNode for new logging API.

Browse Source
This commit is contained in:
AlexVinS
2017-08-11 16:27:42 +03:00
parent 64d9dadd64
commit 046e1a7c29
10 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/map/CMapFormatTest.cpp
View File

@ -9,6 +9,8 @@
*/
#include "StdInc.h"
#include "../lib/JsonDetail.h"
#include "../lib/filesystem/CMemoryBuffer.h"
#include "../lib/filesystem/Filesystem.h"
@ -92,17 +94,11 @@ static JsonNode getFromArchive(CZipLoader & archive, const std::string & archive
static void addToArchive(CZipSaver & saver, const JsonNode & data, const std::string & filename)
{
std::ostringstream out;
out << data;
out.flush();
auto s = data.toJson();
std::unique_ptr<COutputStream> stream = saver.addFile(filename);
{
auto s = out.str();
std::unique_ptr<COutputStream> stream = saver.addFile(filename);
if(stream->write((const ui8*)s.c_str(), s.size()) != s.size())
throw new std::runtime_error("CMapSaverJson::saveHeader() zip compression failed.");
}
if(stream->write((const ui8*)s.c_str(), s.size()) != s.size())
throw new std::runtime_error("CMapSaverJson::saveHeader() zip compression failed.");
}
static std::unique_ptr<CMap> loadOriginal(const JsonNode & header, const JsonNode & objects, const JsonNode & surface, const JsonNode & underground)