1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00

-(linux) Moved all (I hope) files created by VCMI to ~/.vcmi to prevents crash on launch from read-only directory

- minor fixes for #362 #835 #836
This commit is contained in:
Ivan Savenko
2011-11-01 12:58:01 +00:00
parent ede7fd5a7a
commit 0f2e00c780
12 changed files with 66 additions and 45 deletions

View File

@@ -317,7 +317,7 @@ JsonParser::JsonParser(const char * inputString, size_t stringSize, JsonNode &ro
error("Not all file was parsed!", true);
//TODO: better way to show errors (like printing file name as well)
std::cout<<errors;
tlog3<<errors;
}
bool JsonParser::extractSeparator()
@@ -799,7 +799,8 @@ bool JsonValidator::addMessage(const std::string &message)
JsonValidator::JsonValidator(JsonNode &root)
{
const JsonNode schema = root["schema"];
JsonNode schema;
schema.swap(root["schema"]);
if (!schema.isNull())
{
@@ -811,5 +812,5 @@ JsonValidator::JsonValidator(JsonNode &root)
// addMessage("Schema not found!", true);
//TODO: better way to show errors (like printing file name as well)
std::cout<<errors;
tlog3<<errors;
}