fix some weird logic in CoreParameter.cpp

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3237 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-05-15 07:50:23 +00:00
parent 1ffbf6fa53
commit b40b551198
1 changed files with 9 additions and 7 deletions

View File

@ -194,22 +194,24 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios)
CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardA, Region, true); CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardA, Region, true);
CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, Region, false); CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, Region, false);
m_strSRAM = GC_SRAM_FILE; m_strSRAM = GC_SRAM_FILE;
bHLEBios = true;
if (!bWii) if (!bWii)
{ {
m_strBios = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + Region + DIR_SEP GC_IPL; m_strBios = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + Region + DIR_SEP GC_IPL;
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios) if (!bHLEBios)
{ {
if (File::Exists(m_strBios.c_str())) if (!File::Exists(m_strBios.c_str()))
{
bHLEBios = false;
}
else
{ {
WARN_LOG(BOOT, "BIOS file %s not found - using HLE.", m_strBios.c_str()); WARN_LOG(BOOT, "BIOS file %s not found - using HLE.", m_strBios.c_str());
bHLEBios = true;
} }
} }
} }
else if (bWii && !bHLEBios)
{
WARN_LOG(BOOT, "GC BIOS file will not be loaded for Wii mode.");
bHLEBios = true;
}
return true; return true;
} }