diff options
| author | Nicholas Estelami <NEstelami@users.noreply.github.com> | 2021-11-27 15:20:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-27 15:20:15 -0500 |
| commit | e3b53d3b8f88a0d139e72602c52666057e7066c0 (patch) | |
| tree | 96f1f01658dd53bd7510d191dffdad4b3d5b9488 /ZAPD/GameConfig.cpp | |
| parent | 0966109a1402ac4a070345f9e151b93064d09fc9 (diff) | |
Updated MSVC libpng package to newer version (#208)
* Updated nuget to use newer version of libpng. Also updated uses of std::filesystem::path to be compliant with MSVC implementation.
* Updated nuget to use newer version of libpng. Also updated uses of std::filesystem::path to be compliant with MSVC implementation.
* Added missing cpp file and adjusted MSVC includes
* Added new function to StringHelper
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
Diffstat (limited to 'ZAPD/GameConfig.cpp')
| -rw-r--r-- | ZAPD/GameConfig.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ZAPD/GameConfig.cpp b/ZAPD/GameConfig.cpp index f197493..ae29ba2 100644 --- a/ZAPD/GameConfig.cpp +++ b/ZAPD/GameConfig.cpp @@ -25,7 +25,7 @@ GameConfig::~GameConfig() void GameConfig::ReadTexturePool(const fs::path& texturePoolXmlPath) { tinyxml2::XMLDocument doc; - tinyxml2::XMLError eResult = doc.LoadFile(texturePoolXmlPath.c_str()); + tinyxml2::XMLError eResult = doc.LoadFile(texturePoolXmlPath.string().c_str()); if (eResult != tinyxml2::XML_SUCCESS) { @@ -155,7 +155,7 @@ void GameConfig::ReadConfigFile(const fs::path& argConfigFilePath) {"ExternalFile", &GameConfig::ConfigFunc_ExternalFile}, }; - configFilePath = argConfigFilePath; + configFilePath = argConfigFilePath.string(); tinyxml2::XMLDocument doc; tinyxml2::XMLError eResult = doc.LoadFile(configFilePath.c_str()); |