mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-01 02:21:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5400 from JosJuice/volumedirectory-no-emulatedbs2wii

Browse Source 
Don't run EmulatedBS2_Wii with VolumeDirectory
This commit is contained in:
Leo Lam 2017-05-14 22:20:54 +02:00 committed by GitHub
commit c18c1ec6ad
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/Boot/Boot.cpp
View File

@ -354,18 +354,24 @@ bool CBoot::BootUp()
volume = SetDisc(DiscIO::CreateVolumeFromFilename(_StartupPara.m_strDefaultISO)); volume = SetDisc(DiscIO::CreateVolumeFromFilename(_StartupPara.m_strDefaultISO));
} }
if (!EmulatedBS2(dolWii, volume)) // Poor man's bootup
if (dolWii)
{ {
if (dolWii) HID4.SBE = 1;
HID4.SBE = 1;
SetupBAT(dolWii); SetupBAT(dolWii);
if (dolWii) // Because there is no TMD to get the requested system (IOS) version from,
SetupWiiMemory(volume, 0x000000010000003a); // we default to IOS58, which is the version used by the Homebrew Channel.
SetupWiiMemory(volume, 0x000000010000003a);
dolLoader.Load();
PC = dolLoader.GetEntryPoint();
} }
else
{
EmulatedBS2_GC(volume, true);
}
Load_FST(dolWii, volume);
dolLoader.Load();
PC = dolLoader.GetEntryPoint();
if (LoadMapFromFilename()) if (LoadMapFromFilename())
HLE::PatchFunctions(); HLE::PatchFunctions();