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

Ensures MQ and Vanilla title Logos are saved with different names. (#1788)

Browse source 
This way either one can be loaded according to which OTR/whether or not MQ is enabled.
This commit is contained in:
Christopher Leggett 2022-10-23 04:04:20 -04:00 • committed by GitHub
commit 60c9e869e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ZAPDTR/ZAPD/ZResource.cpp
View file

@ -362,6 +362,28 @@ static const char %s[] __attribute__((aligned (2))) = d%s;
}
}
if (name == "gTitleZeldaShieldLogoMQTex")
{
std::string addName = "gTitleZeldaShieldLogoTex";
nameStr = StringHelper::Strip(StringHelper::Strip(addName, "\n"), "\r");
str += StringHelper::Sprintf("\n#define d%s \"__OTR__%s/%s/%s\"", addName.c_str(), prefix.c_str(), outName.c_str(), nameStr.c_str());
if (nameSet && nameSet->find(addName) == nameSet->end())
{
str += StringHelper::Sprintf(R"(
#ifdef _WIN32
static const __declspec(align(2)) char %s[] = d%s;
#else
static const char %s[] __attribute__((aligned (2))) = d%s;
#endif
)", addName.c_str(), addName.c_str(), addName.c_str(), addName.c_str());
if (nameSet)
{
nameSet->insert(addName);
}
}
}
return str;
}
else