Skip to content

Commit

Permalink
Remove the Maps folder from the Sys directory
Browse files Browse the repository at this point in the history
It only had two out of date and game-specific maps from decades ago
  • Loading branch information
Zopolis4 committed Feb 16, 2022
1 parent 5e59561 commit 75e2a02
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 88 deletions.
41 changes: 0 additions & 41 deletions Data/Sys/Maps/GFZE01.map

This file was deleted.

34 changes: 0 additions & 34 deletions Data/Sys/Maps/GMBE8P.map

This file was deleted.

1 change: 0 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 5 additions & 12 deletions Source/Core/Core/Boot/Boot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -366,20 +366,13 @@ bool CBoot::FindMapFile(std::string* existing_map_file, std::string* writable_ma
if (writable_map_file)
*writable_map_file = File::GetUserPath(D_MAPS_IDX) + game_id + ".map";

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)
std::string path = File::GetUserPath(D_MAPS_IDX) + game_id + ".map";
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;
Expand Down

0 comments on commit 75e2a02

Please sign in to comment.