diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2022-12-27 16:47:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-27 16:47:49 -0500 |
| commit | 114bb84aab13a72b76ceafd75187a364fe4db04d (patch) | |
| tree | cc355ebcfa98fb9f8857ae810f6fcc14d367003d | |
| parent | 4bf37fdd60d8874d48ffdc49f1759de722908aa4 (diff) | |
| parent | 42c6c03dc7257cff91256be13ca0ec1681e5517c (diff) | |
Merge pull request #2233 from HarbourMasters/develop-bradley
bradley -> dev
| -rw-r--r-- | ZAPD/ZFile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp index 1ea5cd5..a1d9978 100644 --- a/ZAPD/ZFile.cpp +++ b/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 |