mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-22 16:18:50 -05:00
Code Issues Projects Releases Wiki Activity

bump lus version (#2269)

Browse Source 
* bump lus version

* Fixed StringHelper issues caused by the latest lus version

Co-authored-by: KiritoDv <kiritodev01@gmail.com>
This commit is contained in:
briaguya 2022-12-24 17:49:54 -05:00 committed by GitHub
parent 7768869251
commit 85bccab1bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ZAPDTR/ZAPD/ZFile.cpp
View File

@ -221,7 +221,7 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename)
// Check for repeated attributes. // Check for repeated attributes.
if (offsetXml != nullptr) 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()) if (offsetSet.find(offsetXml) != offsetSet.end())
{ {
@ -831,7 +831,7 @@ void ZFile::GenerateSourceHeaderFiles()
xmlPath = StringHelper::Replace(xmlPath, "\\", "/"); xmlPath = StringHelper::Replace(xmlPath, "\\", "/");
auto pathList = StringHelper::Split(xmlPath, "/"); auto pathList = StringHelper::Split(xmlPath, "/");
std::string outPath = ""; std::string outPath = "";
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
outPath += pathList[i] + "/"; outPath += pathList[i] + "/";
@ -1192,7 +1192,7 @@ std::string ZFile::ProcessTextureIntersections([[maybe_unused]] const std::strin
if (declarations.find(currentOffset) != declarations.end()) if (declarations.find(currentOffset) != declarations.end())
declarations.at(currentOffset)->size = currentTex->GetRawDataSize(); declarations.at(currentOffset)->size = currentTex->GetRawDataSize();
currentTex->DeclareVar(GetName(), ""); currentTex->DeclareVar(GetName(), "");
} }
else else

2
libultraship

@ -1 +1 @@
Subproject commit df3a6dd292c3fbed56969f17d9d018b44c8d2a46 Subproject commit b1c75c86e902e5036ee1d36afad1a35313988fe7

4
soh/soh/Enhancements/sfx-editor/SfxEditor.cpp
View File

@ -358,7 +358,7 @@ extern "C" u16 SfxEditor_GetReplacementSeq(u16 seqId) {
seqId = NA_BGM_FIELD_LOGIC; seqId = NA_BGM_FIELD_LOGIC;
} }
} }
if (sfxEditorSequenceMap.find(seqId) == sfxEditorSequenceMap.end()) { if (sfxEditorSequenceMap.find(seqId) == sfxEditorSequenceMap.end()) {
return seqId; return seqId;
} }
@ -460,7 +460,7 @@ void InitSfxEditor() {
} }
extern "C" void SfxEditor_AddSequence(char *otrPath, uint16_t seqNum) { 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::string fileName = splitName[splitName.size() - 1];
std::vector<std::string> splitFileName = StringHelper::Split(fileName, "_"); std::vector<std::string> splitFileName = StringHelper::Split(fileName, "_");
std::string sequenceName = splitFileName[0]; std::string sequenceName = splitFileName[0];