From 6bc6731f51cb8877709987a2876ba2e3f0a90e88 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 22 Feb 2009 23:36:13 +0000 Subject: [PATCH] "load symbol map" now loads .map if you booted in dol or elf mode git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2382 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/Boot/Boot.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index f9ec920058..358c4a7575 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -84,15 +84,15 @@ void CBoot::UpdateDebugger_MapLoaded(const char *_gameID) std::string CBoot::GenerateMapFilename() { - /* - std::string strDriveDirectory, strFilename; - SplitPath(booted_file, &strDriveDirectory, &strFilename, NULL); - - std::string strFullfilename(strFilename + _T(".map")); - std::string strMapFilename; - BuildCompleteFilename(strMapFilename, strDriveDirectory, strFullfilename); - */ - return FULL_MAPS_DIR + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".map"; + SCoreStartupParameter& _StartupPara = SConfig::GetInstance().m_LocalCoreStartupParameter; + switch (_StartupPara.m_BootType) + { + case SCoreStartupParameter::BOOT_ELF: + case SCoreStartupParameter::BOOT_DOL: + return _StartupPara.m_strFilename.substr(0, _StartupPara.m_strFilename.size()-4) + ".map"; + default: + return FULL_MAPS_DIR + _StartupPara.GetUniqueID() + ".map"; + } } bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_gameID)