From 85bccab1bb38e0fb497fc60e5e3db3aa35bc7b8e Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Sat, 24 Dec 2022 17:49:54 -0500 Subject: [PATCH] bump lus version (#2269) * bump lus version * Fixed StringHelper issues caused by the latest lus version Co-authored-by: KiritoDv --- ZAPDTR/ZAPD/ZFile.cpp | 6 +++--- libultraship | 2 +- soh/soh/Enhancements/sfx-editor/SfxEditor.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ZAPDTR/ZAPD/ZFile.cpp b/ZAPDTR/ZAPD/ZFile.cpp index 1ea5cd55363..a1d9978a1a7 100644 --- a/ZAPDTR/ZAPD/ZFile.cpp +++ b/ZAPDTR/ZAPD/ZFile.cpp @@ -221,7 +221,7 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename) // Check for repeated attributes. if (offsetXml != nullptr) { - rawDataIndex = strtol(StringHelper::Split(offsetXml, "0x")[1].c_str(), NULL, 16); + rawDataIndex = strtol(StringHelper::Split(std::string(offsetXml), "0x")[1].c_str(), NULL, 16); if (offsetSet.find(offsetXml) != offsetSet.end()) { @@ -831,7 +831,7 @@ void ZFile::GenerateSourceHeaderFiles() xmlPath = StringHelper::Replace(xmlPath, "\\", "/"); auto pathList = StringHelper::Split(xmlPath, "/"); std::string outPath = ""; - + for (int i = 0; i < 3; i++) outPath += pathList[i] + "/"; @@ -1192,7 +1192,7 @@ std::string ZFile::ProcessTextureIntersections([[maybe_unused]] const std::strin if (declarations.find(currentOffset) != declarations.end()) declarations.at(currentOffset)->size = currentTex->GetRawDataSize(); - + currentTex->DeclareVar(GetName(), ""); } else diff --git a/libultraship b/libultraship index df3a6dd292c..b1c75c86e90 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit df3a6dd292c3fbed56969f17d9d018b44c8d2a46 +Subproject commit b1c75c86e902e5036ee1d36afad1a35313988fe7 diff --git a/soh/soh/Enhancements/sfx-editor/SfxEditor.cpp b/soh/soh/Enhancements/sfx-editor/SfxEditor.cpp index 9ac5a0cbee7..357b911f2b1 100644 --- a/soh/soh/Enhancements/sfx-editor/SfxEditor.cpp +++ b/soh/soh/Enhancements/sfx-editor/SfxEditor.cpp @@ -358,7 +358,7 @@ extern "C" u16 SfxEditor_GetReplacementSeq(u16 seqId) { seqId = NA_BGM_FIELD_LOGIC; } } - + if (sfxEditorSequenceMap.find(seqId) == sfxEditorSequenceMap.end()) { return seqId; } @@ -460,7 +460,7 @@ void InitSfxEditor() { } extern "C" void SfxEditor_AddSequence(char *otrPath, uint16_t seqNum) { - std::vector splitName = StringHelper::Split(otrPath, "/"); + std::vector splitName = StringHelper::Split(std::string(otrPath), "/"); std::string fileName = splitName[splitName.size() - 1]; std::vector splitFileName = StringHelper::Split(fileName, "_"); std::string sequenceName = splitFileName[0];