mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 08:50:23 +00:00
Code Issues Projects Releases Wiki Activity

git subrepo pull --force tools/ZAPD (#718)

Browse source 
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "4bf6600a3"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "4bf6600a3"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
This commit is contained in:
fig02 2021-03-14 11:40:25 -04:00 • committed by GitHub
parent 8a730123b6
commit 42af56b231
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 1854 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/ZAPD/ZAPD/ZFile.cpp
View file

@ -4,6 +4,7 @@
#include "ZRoom/ZRoom.h"
#include "ZTexture.h"
#include "ZAnimation.h"
#include "ZLimb.h"
#include "ZSkeleton.h"
#include "ZCollision.h"
#include "ZScalar.h"
@ -237,10 +238,10 @@ void ZFile::ParseXML(ZFileMode mode, XMLElement* reader, std::string filename, b
}
else if (string(child->Name()) == "Limb")
{
ZLimbStandard* limb = nullptr;
ZLimb* limb = nullptr;
if (mode == ZFileMode::Extract)
limb = ZLimbStandard::FromXML(child, rawData, rawDataIndex, folderName, this);
limb = ZLimb::FromXML(child, rawData, rawDataIndex, folderName, this);
resources.push_back(limb);
@ -977,6 +978,10 @@ string ZFile::ProcessDeclarations()
// Next, output the actual declarations
for (pair<int32_t, Declaration*> item : declarationKeysSorted)
{
if (item.first < rangeStart || item.first >= rangeEnd) {
continue;
}
if (item.second->includePath != "")
{
//output += StringHelper::Sprintf("#include \"%s\"\n", item.second->includePath.c_str());
@ -1080,6 +1085,10 @@ string ZFile::ProcessExterns()
for (pair<int32_t, Declaration*> item : declarationKeysSorted)
{
if (item.first < rangeStart || item.first >= rangeEnd) {
continue;
}
if (!StringHelper::StartsWith(item.second->varType, "static ") && item.second->varType != "")// && item.second->includePath == "")
{
if (item.second->isArray)