games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Various tweaks

Browse Source
This commit is contained in:
George King
2025-04-07 16:37:51 +02:00
committed by GitHub
parent 451f22a22f
commit d2e5fdce56
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/VCMIDirs.cpp
View File

@@ -24,7 +24,7 @@ namespace bfs = boost::filesystem;
bfs::path IVCMIDirs::userLogsPath() const { return userCachePath(); } bfs::path IVCMIDirs::userLogsPath() const { return userCachePath(); }
bfs::path IVCMIDirs::userSavePath() const { return userDataPath() / "saves"; } bfs::path IVCMIDirs::userSavePath() const { return userDataPath() / "Saves"; }
bfs::path IVCMIDirs::userExtractedPath() const { return userCachePath() / "extracted"; } bfs::path IVCMIDirs::userExtractedPath() const { return userCachePath() / "extracted"; }
@@ -96,8 +96,6 @@ class VCMIDirsWIN32 final : public IVCMIDirs
std::string libraryName(const std::string& basename) const override; std::string libraryName(const std::string& basename) const override;
void init() override;
protected: protected:
mutable std::optional<JsonNode> dirsConfig; mutable std::optional<JsonNode> dirsConfig;
void loadDirsJsonIfNeeded() const; void loadDirsJsonIfNeeded() const;
@@ -124,7 +122,6 @@ void VCMIDirsWIN32::loadDirsJsonIfNeeded() const
wchar_t currentPath[MAX_PATH]; wchar_t currentPath[MAX_PATH];
GetModuleFileNameW(nullptr, currentPath, MAX_PATH); GetModuleFileNameW(nullptr, currentPath, MAX_PATH);
auto configPath = bfs::path(currentPath).parent_path() / "config" / "dirs.json"; auto configPath = bfs::path(currentPath).parent_path() / "config" / "dirs.json";
if (!bfs::exists(configPath)) if (!bfs::exists(configPath))
@@ -133,7 +130,7 @@ void VCMIDirsWIN32::loadDirsJsonIfNeeded() const
return; return;
} }
std::ifstream in(configPath.c_str(), std::ios::binary); std::ifstream in(configPath.wstring(), std::ios::binary);
if (!in) if (!in)
{ {
dirsConfig = std::nullopt; dirsConfig = std::nullopt;
@@ -141,7 +138,13 @@ void VCMIDirsWIN32::loadDirsJsonIfNeeded() const
} }
std::string buffer((std::istreambuf_iterator<char>(in)), {}); std::string buffer((std::istreambuf_iterator<char>(in)), {});
dirsConfig = JsonNode(reinterpret_cast<const std::byte*>(buffer.data()), buffer.size(), configPath.string()); std::wstring wstr = configPath.wstring();
int size = WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), -1, nullptr, 0, nullptr, nullptr);
std::string utf8path(size - 1, 0);
WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), -1, utf8path.data(), size, nullptr, nullptr);
dirsConfig = JsonNode(reinterpret_cast<const std::byte*>(buffer.data()), buffer.size(), utf8path);
} }
bfs::path VCMIDirsWIN32::getPathFromConfigOrDefault(const std::string& key, const std::function<bfs::path()>& fallbackFunc) const bfs::path VCMIDirsWIN32::getPathFromConfigOrDefault(const std::string& key, const std::function<bfs::path()>& fallbackFunc) const
@@ -164,16 +167,10 @@ bfs::path VCMIDirsWIN32::getPathFromConfigOrDefault(const std::string& key, cons
return bfs::path(raw); return bfs::path(raw);
} }
void VCMIDirsWIN32::init()
{
// Call base (init dirs)
IVCMIDirs::init();
}
static bfs::path getDefaultUserDataPath() static bfs::path getDefaultUserDataPath()
{ {
wchar_t profileDir[MAX_PATH]; wchar_t profileDir[MAX_PATH];
if (SHGetSpecialFolderPathW(nullptr, profileDir, CSIDL_MYDOCUMENTS, FALSE)) if (SHGetSpecialFolderPathW(nullptr, profileDir, CSIDL_MYDOCUMENTS, FALSE) != FALSE)
return bfs::path(profileDir) / "My Games" / "vcmi"; return bfs::path(profileDir) / "My Games" / "vcmi";
return bfs::path("."); return bfs::path(".");
} }
@@ -200,7 +197,7 @@ bfs::path VCMIDirsWIN32::userLogsPath() const
bfs::path VCMIDirsWIN32::userSavePath() const bfs::path VCMIDirsWIN32::userSavePath() const
{ {
return getPathFromConfigOrDefault("userSavePath", [this] { return userDataPath() / "saves"; }); return getPathFromConfigOrDefault("userSavePath", [this] { return userDataPath() / "Saves"; });
} }
std::vector<bfs::path> VCMIDirsWIN32::dataPaths() const std::vector<bfs::path> VCMIDirsWIN32::dataPaths() const