github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-14 02:27:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Audio support nearly complete.

Browse source
This commit is contained in:
Nicholas Estelami 2022-06-10 13:37:50 -04:00
commit 61760401bc
25 changed files with 1953 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ZAPDTR/ZAPD/ZResource.cpp
View file

@ -100,11 +100,14 @@ void ZResource::ParseXML(tinyxml2::XMLElement* reader)
attrs = attrs->Next();
}
if (!canHaveInner && !reader->NoChildren())
if (!Globals::Instance->otrMode)
{
std::string errorHeader = StringHelper::Sprintf(
"resource '%s' with inner element/child detected", reader->Name());
HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, "");
if (!canHaveInner && !reader->NoChildren())
{
std::string errorHeader = StringHelper::Sprintf(
"resource '%s' with inner element/child detected", reader->Name());
HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, "");
}
}
for (const auto& attr : registeredAttributes)
@ -121,7 +124,6 @@ void ZResource::ParseXML(tinyxml2::XMLElement* reader)
name = registeredAttributes.at("Name").value;
// Disable this check for OTR file generation for now since it takes up a considerable amount of CPU time
if (!Globals::Instance->otrMode)
{