bump lus version (#2269)

* bump lus version * Fixed StringHelper issues caused by the latest lus version Co-authored-by: KiritoDv <kiritodev01@gmail.com>
HarbourMasters · Dec 24, 2022 · 85bccab · 85bccab
1 parent 7768869
commit 85bccab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
diff --git 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<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];