From 5e4d1f732db7f2ef397c55ba8fadbbf2975c6bbe Mon Sep 17 00:00:00 2001 From: Zopolis4 Date: Thu, 3 Feb 2022 10:40:28 +1100 Subject: Remove the Maps folder from the Sys directory It only had two out of date and game-specific maps from decades ago --- Source/Core/Core/Boot/Boot.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'Source') diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index 30691c730f..0ad7f6ec12 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -362,24 +362,17 @@ void CBoot::UpdateDebugger_MapLoaded() bool CBoot::FindMapFile(std::string* existing_map_file, std::string* writable_map_file) { const std::string& game_id = SConfig::GetInstance().m_debugger_game_id; + std::string path = File::GetUserPath(D_MAPS_IDX) + game_id + ".map"; if (writable_map_file) - *writable_map_file = File::GetUserPath(D_MAPS_IDX) + game_id + ".map"; + *writable_map_file = path; - static const std::array maps_directories{ - File::GetUserPath(D_MAPS_IDX), - File::GetSysDirectory() + MAPS_DIR DIR_SEP, - }; - for (const auto& directory : maps_directories) + if (File::Exists(path)) { - std::string path = directory + game_id + ".map"; - if (File::Exists(path)) - { - if (existing_map_file) - *existing_map_file = std::move(path); + if (existing_map_file) + *existing_map_file = std::move(path); - return true; - } + return true; } return false; -- cgit v1.2.3