commit 7c8588cd

sago007 · 2017-01-08 13:39
7c8588cdd96d5a1a28c17dbea56e250b8c4c70e9 patch · browse files
parent c79aae93d3fd328da00d21a863256cf97dec5a9e

Prevent problem with trying to make a sprite from a comment.

Changed files

M	source/code/sago/SagoSpriteHolder.cpp before

diff --git a/source/code/sago/SagoSpriteHolder.cpp b/source/code/sago/SagoSpriteHolder.cpp index 4d40101..5b2f99c 100644 --- a/source/code/sago/SagoSpriteHolder.cpp +++ b/source/code/sago/SagoSpriteHolder.cpp

@@ -79,6 +79,13 @@ void SagoSpriteHolder::ReadSpriteFile(const std::string& filename) {

for (Json::Value::iterator it = root.begin(); it != root.end() ; ++it) {

string spriteName = it.key().asString();

Json::Value value = (*it);

+ if (!value.isObject()) {

+ if (spriteName.c_str()[0] != '_') {

+ //We ignore errors if the name starts with an underscore like "_comment"

+ std::cerr << "Invalid sprite: " << spriteName << "\n";

+ }

+ continue;

+ }

string textureName = value.get("texture","fallback").asString();

int topx = value.get("topx",0).asInt();

int topy = value.get("topy",0).asInt();