diff options
| -rw-r--r-- | gui/resources.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gui/resources.cpp b/gui/resources.cpp index 1e2e7f9c6..563dcc45c 100644 --- a/gui/resources.cpp +++ b/gui/resources.cpp @@ -288,17 +288,19 @@ ResourceManager::ResourceManager() void ResourceManager::LoadResources(xml_node<>* resList, ZipArchive* pZip) { - xml_node<>* child; - if (!resList) return; - child = resList->first_node("resource"); - while (child != NULL) + + for (xml_node<>* child = resList->first_node(); child; child = child->next_sibling()) { - xml_attribute<>* attr = child->first_attribute("type"); + std::string type = child->name(); + if (type == "resource") { + // legacy format : <resource type="..."> + xml_attribute<>* attr = child->first_attribute("type"); + type = attr ? attr->value() : "*unspecified*"; + } bool error = false; - std::string type = attr ? attr->value() : "*unspecified*"; if (type == "font") { FontResource* res = new FontResource(child, pZip); @@ -356,8 +358,6 @@ void ResourceManager::LoadResources(xml_node<>* resList, ZipArchive* pZip) } else LOGERR("Resource type (%s) failed to load\n", type.c_str()); } - - child = child->next_sibling("resource"); } } |