Boot: Restore symbol map loading

This commit is contained in:
Léo Lam committed 2017-06-06 16:40:00 +02:00
1 parent 9a3fb858f3
commit d50b4406a6
5 files changed
+24 -12

No files matched your search

+2 -6
View File
@@ -178,17 +178,13 @@ void CBoot::UpdateDebugger_MapLoaded()
}
// Get map file paths for the active title.
bool CBoot::FindMapFile(std::string* existing_map_file, std::string* writable_map_file,
std::string* title_id)
bool CBoot::FindMapFile(std::string* existing_map_file, std::string* writable_map_file)
{
const std::string game_id = SConfig::GetInstance().GetGameID();
const std::string& game_id = SConfig::GetInstance().m_debugger_game_id;
if (writable_map_file)
*writable_map_file = File::GetUserPath(D_MAPS_IDX) + game_id + ".map";
if (title_id)
*title_id = game_id;
bool found = false;
static const std::string maps_directories[] = {File::GetUserPath(D_MAPS_IDX),
File::GetSysDirectory() + MAPS_DIR DIR_SEP};
+1 -4
View File
@@ -81,11 +81,8 @@ public:
// If writable_map_file is not nullptr, it is set to the path to where a map
// file should be saved.
//
// If title_id is not nullptr, it is set to the title id
//
// Returns true if a map file exists, false if none could be found.
static bool FindMapFile(std::string* existing_map_file, std::string* writable_map_file,
std::string* title_id = nullptr);
static bool FindMapFile(std::string* existing_map_file, std::string* writable_map_file);
static bool LoadMapFromFilename();
private: