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

Boot: Consider DOL/ELF files as possible volumes

Browse Source 
The old approach to detecting DOL/ELF files doesn't fit
with the new way of implementing extracted discs.

The game list is already doing it in a way that's similar
to the approach that this commit uses.
This commit is contained in:
JosJuice 2017-06-07 14:18:55 +02:00
parent 2098ee1b15
commit 878869488d
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,35 +63,34 @@ std::unique_ptr<BootParameters> BootParameters::GenerateFromFile(const std::stri
std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower); std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
static const std::unordered_set<std::string> disc_image_extensions = { static const std::unordered_set<std::string> disc_image_extensions = {
{".gcm", ".iso", ".tgc", ".wbfs", ".ciso", ".gcz"}}; {".gcm", ".iso", ".tgc", ".wbfs", ".ciso", ".gcz", ".dol", ".elf"}};
if (disc_image_extensions.find(extension) != disc_image_extensions.end() || is_drive) if (disc_image_extensions.find(extension) != disc_image_extensions.end() || is_drive)
{ {
auto volume = DiscIO::CreateVolumeFromFilename(path); std::unique_ptr<DiscIO::Volume> volume = DiscIO::CreateVolumeFromFilename(path);
if (!volume) if (volume)
return std::make_unique<BootParameters>(Disc{path, std::move(volume)});
if (extension == ".elf")
return std::make_unique<BootParameters>(Executable{path, std::make_unique<ElfReader>(path)});
if (extension == ".dol")
return std::make_unique<BootParameters>(Executable{path, std::make_unique<DolReader>(path)});
if (is_drive)
{ {
if (is_drive) PanicAlertT("Could not read \"%s\". "
{ "There is no disc in the drive or it is not a GameCube/Wii backup. "
PanicAlertT("Could not read \"%s\". " "Please note that Dolphin cannot play games directly from the original "
"There is no disc in the drive or it is not a GameCube/Wii backup. " "GameCube and Wii discs.",
"Please note that Dolphin cannot play games directly from the original " path.c_str());
"GameCube and Wii discs.",
path.c_str());
}
else
{
PanicAlertT("\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO.", path.c_str());
}
return {};
} }
return std::make_unique<BootParameters>(Disc{path, std::move(volume)}); else
{
PanicAlertT("\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO.", path.c_str());
}
return {};
} }
if (extension == ".elf")
return std::make_unique<BootParameters>(Executable{path, std::make_unique<ElfReader>(path)});
if (extension == ".dol")
return std::make_unique<BootParameters>(Executable{path, std::make_unique<DolReader>(path)});
if (extension == ".dff") if (extension == ".dff")
return std::make_unique<BootParameters>(DFF{path}); return std::make_unique<BootParameters>(DFF{path});