diff options
| author | hrydgard <hrydgard@gmail.com> | 2009-05-01 08:23:25 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2009-05-01 08:23:25 +0000 |
| commit | 07b774c7dee376b7559ae7feb31f5304339d24fb (patch) | |
| tree | fa402d6f02d9c3f6d1ff665d66269eb2362adcfa /Source/Core | |
| parent | edc143e25d60c5d0775fa0049ace9bf6d8bcef4f (diff) | |
debugfast build fixing. make the hle bios loading-or-not logic make sense.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3113 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/CoreParameter.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index cc44cfcf0c..2fd55e4a31 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -194,13 +194,22 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios) CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardA, Region, true); CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, Region, false); m_strSRAM = GC_SRAM_FILE; - m_strBios = FULL_GC_SYS_DIR + Region + DIR_SEP GC_IPL; - if (!File::Exists(m_strBios.c_str()) || SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios) + bHLEBios = true; + if (!bWii) { - //WARN_LOG(BOOT, "BIOS file %s not found - using HLE.", m_strBios.c_str()); - bHLEBios = true; + m_strBios = FULL_GC_SYS_DIR + Region + DIR_SEP GC_IPL; + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios) + { + if (File::Exists(m_strBios.c_str())) + { + bHLEBios = false; + } + else + { + WARN_LOG(BOOT, "BIOS file %s not found - using HLE.", m_strBios.c_str()); + } + } } - return true; } |