Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump lus version #2269

Merged
merged 2 commits into from
Dec 24, 2022
Merged

bump lus version #2269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5842d10
bump lus version
Dec 24, 2022
c2fadb3
Fixed StringHelper issues caused by the latest lus version
KiritoDv Dec 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ZAPDTR/ZAPD/ZFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down Expand Up @@ -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] + "/";

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libultraship
Open in desktop
Submodule libultraship updated 3 files
+17 −0 extern/ZAPDUtils/Utils/StringHelper.cpp
+1 −0 extern/ZAPDUtils/Utils/StringHelper.h
+10 −9 src/resource/Archive.cpp
4 changes: 2 additions & 2 deletions soh/soh/Enhancements/sfx-editor/SfxEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ extern "C" u16 SfxEditor_GetReplacementSeq(u16 seqId) {
seqId = NA_BGM_FIELD_LOGIC;
}
}

if (sfxEditorSequenceMap.find(seqId) == sfxEditorSequenceMap.end()) {
return seqId;
}
Expand Down Expand Up @@ -460,7 +460,7 @@ void InitSfxEditor() {
}

extern "C" void SfxEditor_AddSequence(char *otrPath, uint16_t seqNum) {
std::vector<std::string> splitName = StringHelper::Split(otrPath, "/");
std::vector<std::string> splitName = StringHelper::Split(std::string(otrPath), "/");
std::string fileName = splitName[splitName.size() - 1];
std::vector<std::string> splitFileName = StringHelper::Split(fileName, "_");
std::string sequenceName = splitFileName[0];
Expand Down