mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 18:30:35 +00:00
Code Issues Projects Releases Wiki Activity

Update ZAPD (#1001)

Browse source 
* remove fake match

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "3e9ed72e2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "3e9ed72e2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* new extraction script and a hack to make clear tag work

* fix clear tag again

* remove static from clear tag DLists

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e7a8a48cf"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e7a8a48cf"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e243634e5"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e243634e5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "d0cd6b397"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "d0cd6b397"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Update ovl_En_Clear_Tag.xml
This commit is contained in:
louist103 2021-10-17 07:32:09 -04:00 • committed by GitHub
parent ed487b4bb8
commit 750c0cab35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
272 changed files with 7790 additions and 58414 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tools/ZAPD/ZAPD/ZSymbol.cpp
View file

@ -1,5 +1,6 @@
#include "ZSymbol.h"
#include "StringHelper.h"
#include "Utils/StringHelper.h"
#include "ZFile.h"
REGISTER_ZFILENODE(Symbol, ZSymbol);
@ -54,6 +55,18 @@ void ZSymbol::ParseXML(tinyxml2::XMLElement* reader)
if (countXml != "")
count = StringHelper::StrToL(countXml, 0);
}
if (registeredAttributes.at("Static").value == "On")
{
fprintf(stderr, "A <Symbol> can't be marked as static.\n\t Disabling static\n");
}
staticConf = StaticConfig::Off;
}
Declaration* ZSymbol::DeclareVar([[maybe_unused]] const std::string& prefix,
[[maybe_unused]] const std::string& bodyStr)
{
return nullptr;
}
size_t ZSymbol::GetRawDataSize() const
@ -64,19 +77,17 @@ size_t ZSymbol::GetRawDataSize() const
return typeSize;
}
std::string ZSymbol::GetSourceOutputHeader(const std::string& prefix)
std::string ZSymbol::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix)
{
if (isArray)
{
if (count == 0)
return StringHelper::Sprintf("extern %s %s%s[];\n", type.c_str(), prefix.c_str(),
name.c_str());
return StringHelper::Sprintf("extern %s %s[];\n", type.c_str(), name.c_str());
else
return StringHelper::Sprintf("extern %s %s%s[%i];\n", type.c_str(), prefix.c_str(),
name.c_str(), count);
return StringHelper::Sprintf("extern %s %s[%i];\n", type.c_str(), name.c_str(), count);
}
return StringHelper::Sprintf("extern %s %s%s;\n", type.c_str(), prefix.c_str(), name.c_str());
return StringHelper::Sprintf("extern %s %s;\n", type.c_str(), name.c_str());
}
std::string ZSymbol::GetSourceTypeName() const