diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2023-10-17 22:04:12 -0400 |
|---|---|---|
| committer | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2023-10-17 22:04:12 -0400 |
| commit | e9f4fc638ed904cc0dcdac24ea7708c9a220a702 (patch) | |
| tree | 114c3d432697e04831741e623ae2340f6239bbe9 /ZAPD/GameConfig.cpp | |
| parent | dcf56d93ecbd4db3bfd8a4832d7f991467964b98 (diff) | |
update to latest version used by SoH
Diffstat (limited to 'ZAPD/GameConfig.cpp')
| -rw-r--r-- | ZAPD/GameConfig.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ZAPD/GameConfig.cpp b/ZAPD/GameConfig.cpp index 777cf9d..9a2e889 100644 --- a/ZAPD/GameConfig.cpp +++ b/ZAPD/GameConfig.cpp @@ -2,9 +2,10 @@ #include <functional> #include <string_view> +#include <unordered_map> #include "Utils/Directory.h" -#include "Utils/File.h" +#include <Utils/DiskFile.h> #include "Utils/Path.h" #include "ZFile.h" #include "tinyxml2.h" @@ -56,7 +57,7 @@ void GameConfig::ReadTexturePool(const fs::path& texturePoolXmlPath) void GameConfig::GenSymbolMap(const fs::path& symbolMapPath) { - auto symbolLines = File::ReadAllLines(symbolMapPath); + auto symbolLines = DiskFile::ReadAllLines(symbolMapPath); for (std::string& symbolLine : symbolLines) { @@ -78,7 +79,7 @@ void GameConfig::ConfigFunc_ActorList(const tinyxml2::XMLElement& element) { std::string fileName = element.Attribute("File"); std::vector<std::string> lines = - File::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); + DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); for (auto& line : lines) actorList.emplace_back(std::move(line)); @@ -88,7 +89,7 @@ void GameConfig::ConfigFunc_ObjectList(const tinyxml2::XMLElement& element) { std::string fileName = element.Attribute("File"); std::vector<std::string> lines = - File::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); + DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); for (auto& line : lines) objectList.emplace_back(std::move(line)); @@ -98,7 +99,7 @@ void GameConfig::ConfigFunc_EntranceList(const tinyxml2::XMLElement& element) { std::string fileName = element.Attribute("File"); std::vector<std::string> lines = - File::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); + DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); for (auto& line : lines) entranceList.emplace_back(std::move(line)); @@ -108,7 +109,7 @@ void GameConfig::ConfigFunc_specialEntranceList(const tinyxml2::XMLElement& elem { std::string fileName = element.Attribute("File"); std::vector<std::string> lines = - File::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); + DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); for (auto& line : lines) specialEntranceList.emplace_back(std::move(line)); |