From 27c197e95e75f4d9d37acf6d7a835904a9555907 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Mon, 10 Apr 2023 10:13:14 +0200 Subject: [PATCH 1/2] cleanup game settings --- .../{gamesettings.cpp => game_settings.cpp} | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) rename src/client/component/{gamesettings.cpp => game_settings.cpp} (60%) diff --git a/src/client/component/gamesettings.cpp b/src/client/component/game_settings.cpp similarity index 60% rename from src/client/component/gamesettings.cpp rename to src/client/component/game_settings.cpp index c511ef5c..85680f6e 100644 --- a/src/client/component/gamesettings.cpp +++ b/src/client/component/game_settings.cpp @@ -11,54 +11,54 @@ namespace gamesettings namespace { // - std::unordered_map gamesettings_files; + std::unordered_map game_settings_files; - const std::string get_gamesettings_name(const std::vector& sub_strings) + std::string get_game_settings_name(const std::vector& sub_strings) { if (sub_strings.size() > 2) { return sub_strings[sub_strings.size() - 2] + '/' + sub_strings[sub_strings.size() - 1]; } - return ""; + return std::string(); } - const std::string get_gamesettings_path(const std::string& name) + std::string get_game_settings_path(const std::string& name) { - const auto itr = gamesettings_files.find(name); - return (itr == gamesettings_files.end()) ? "" : itr->second; + const auto itr = game_settings_files.find(name); + return (itr == game_settings_files.end()) ? std::string() : itr->second; } - void search_gamesettings_folder(const std::string& gamesettings_dir) + void search_game_settings_folder(const std::string& game_settings_dir) { - if (!utils::io::directory_exists(gamesettings_dir)) + if (!utils::io::directory_exists(game_settings_dir)) { return; } - const auto files = utils::io::list_files(gamesettings_dir, true); + const auto files = utils::io::list_files(game_settings_dir, true); for (const auto& path : files) { if (!std::filesystem::is_directory(path)) { auto sub_strings = utils::string::split(path.generic_string(), '/'); - gamesettings_files.insert_or_assign(get_gamesettings_name(sub_strings), path.generic_string()); + game_settings_files.insert_or_assign(get_game_settings_name(sub_strings), path.generic_string()); } } } - bool has_gamesettings_file_on_disk(const char* path) + bool has_game_settings_file_on_disk(const char* path) { if (!path) { return false; } - auto sub_strings = utils::string::split(path, '/'); - auto gamesettings_name = get_gamesettings_name(sub_strings); + const auto sub_strings = utils::string::split(path, '/'); + const auto game_settings_name = get_game_settings_name(sub_strings); - return get_gamesettings_path(gamesettings_name) != ""; + return !get_game_settings_path(game_settings_name).empty(); } void cmd_exec_stub(utils::hook::assembler& a) @@ -69,7 +69,7 @@ namespace gamesettings a.pushad64(); a.mov(rcx, r10); - a.call_aligned(has_gamesettings_file_on_disk); + a.call_aligned(has_game_settings_file_on_disk); a.cmp(rax, 1); ; a.popad64(); @@ -86,11 +86,11 @@ namespace gamesettings int read_file_stub(const char* qpath, void** buffer) { - auto sub_strings = utils::string::split(qpath, '/'); - auto game_settings_name = get_gamesettings_name(sub_strings); + const auto sub_strings = utils::string::split(qpath, '/'); + const auto game_settings_name = get_game_settings_name(sub_strings); std::string gamesettings_data; - utils::io::read_file(get_gamesettings_path(game_settings_name), &gamesettings_data); + utils::io::read_file(get_game_settings_path(game_settings_name), &gamesettings_data); if (!gamesettings_data.empty()) { @@ -113,8 +113,8 @@ namespace gamesettings { const utils::nt::library host{}; - search_gamesettings_folder((game::get_appdata_path() / "data/gamesettings").string()); - search_gamesettings_folder((host.get_folder() / "boiii/gamesettings").string()); + search_game_settings_folder((game::get_appdata_path() / "data/gamesettings").string()); + search_game_settings_folder((host.get_folder() / "boiii/gamesettings").string()); } } From 481e892351abc73b98d9a34570184e6c2e6bf4a5 Mon Sep 17 00:00:00 2001 From: Edo Date: Mon, 10 Apr 2023 10:20:48 +0200 Subject: [PATCH 2/2] use brace'd initializer --- src/client/component/game_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/component/game_settings.cpp b/src/client/component/game_settings.cpp index 85680f6e..0572f0b8 100644 --- a/src/client/component/game_settings.cpp +++ b/src/client/component/game_settings.cpp @@ -20,7 +20,7 @@ namespace gamesettings return sub_strings[sub_strings.size() - 2] + '/' + sub_strings[sub_strings.size() - 1]; } - return std::string(); + return {}; } std::string get_game_settings_path(const std::string& name)