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 | ab104623a74311ed3ba20fc059b012b3940c300b (patch) | |
| tree | 7ff17cd6a5eeced80ee5ae6828d73880fe2ed4fd /ZAPDTR/ZAPD/ZFile.cpp | |
| parent | 5ce4e75bd2e3ec6a7003c6b33a07487aafcdc78e (diff) | |
| parent | f42f86e3ef4636e224eee474654eeda86c8d3a2b (diff) | |
Merge pull request #2233 from HarbourMasters/develop-bradley
bradley -> dev
Diffstat (limited to 'ZAPDTR/ZAPD/ZFile.cpp')
| -rw-r--r-- | ZAPDTR/ZAPD/ZFile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ZAPDTR/ZAPD/ZFile.cpp b/ZAPDTR/ZAPD/ZFile.cpp index 1ea5cd553..a1d9978a1 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 |