Merge pull request #10429 from Zopolis4/mapurge

Remove the Maps folder from the Sys directory
dolphin-emu · Feb 18, 2022 · bb7475e · bb7475e
2 parents 0c78167 + 5e4d1f7
commit bb7475e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 89 deletions.
diff --git a/Data/Sys/Maps/GFZE01.map b/Data/Sys/Maps/GFZE01.map
diff --git a/Data/Sys/Maps/GMBE8P.map b/Data/Sys/Maps/GMBE8P.map
diff --git a/Readme.md b/Readme.md
@@ -200,7 +200,6 @@ These folders are installed read-only and should not be changed:
 
 * `GameSettings`: per-game default settings database
 * `GC`: DSP and font dumps
-* `Maps`: symbol tables (dev only)
 * `Shaders`: post-processing shaders
 * `Themes`: icon themes for GUI
 * `Resources`: icons that are theme-agnostic

diff --git 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<std::string, 2> 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;