mirror of
https://github.com/zeldaret/mm.git
synced 2026-07-02 03:30:19 -04:00
ZAPD update: Gotta go fast! (#226)
* update extract_assets script * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * fixes and rgba16 format change * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Update warning counts
This commit is contained in:
@@ -22,7 +22,7 @@ void ZArray::ParseXML(tinyxml2::XMLElement* reader)
|
||||
{
|
||||
ZResource::ParseXML(reader);
|
||||
|
||||
arrayCnt = StringHelper::StrToL(registeredAttributes.at("Count").value, 0);
|
||||
arrayCnt = reader->IntAttribute("Count", 0);
|
||||
// TODO: do a better check.
|
||||
assert(arrayCnt > 0);
|
||||
|
||||
@@ -46,7 +46,7 @@ void ZArray::ParseXML(tinyxml2::XMLElement* reader)
|
||||
}
|
||||
res->parent = parent;
|
||||
res->SetInnerNode(true);
|
||||
res->ExtractFromXML(child, rawData, childIndex);
|
||||
res->ExtractFromXML(child, childIndex);
|
||||
|
||||
childIndex += res->GetRawDataSize();
|
||||
resList.push_back(res);
|
||||
|
||||
Reference in New Issue
Block a user