ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

actually remove NDS/GBA ROM args from NDSArgs, since we won't be using them

This commit is contained in:
Arisotura 2024-11-17 19:38:36 +01:00
parent 5e3d2d07c3
commit 99aa5676db
4 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Args.h
View File

@ -85,18 +85,6 @@ struct GDBArgs
/// New fields here should have default values if possible. /// New fields here should have default values if possible.
struct NDSArgs struct NDSArgs
{ {
/// NDS ROM to install.
/// Defaults to nullptr, which means no cart.
/// Should be populated with the desired save data beforehand,
/// including an SD card if applicable.
std::unique_ptr<NDSCart::CartCommon> NDSROM = nullptr;
/// GBA ROM to install.
/// Defaults to nullptr, which means no cart.
/// Should be populated with the desired save data beforehand.
/// Ignored in DSi mode.
std::unique_ptr<GBACart::CartCommon> GBAROM = nullptr;
/// NDS ARM9 BIOS to install. /// NDS ARM9 BIOS to install.
/// Defaults to FreeBIOS, which is not compatible with DSi mode. /// Defaults to FreeBIOS, which is not compatible with DSi mode.
std::unique_ptr<ARM9BIOSImage> ARM9BIOS = std::make_unique<ARM9BIOSImage>(bios_arm9_bin); std::unique_ptr<ARM9BIOSImage> ARM9BIOS = std::make_unique<ARM9BIOSImage>(bios_arm9_bin);

2
src/DSi.cpp
View File

@ -74,8 +74,6 @@ const u32 NDMAModes[] =
DSi( DSi(
DSiArgs { DSiArgs {
NDSArgs { NDSArgs {
nullptr,
nullptr,
bios_arm9_bin, bios_arm9_bin,
bios_arm7_bin, bios_arm7_bin,
Firmware(0), Firmware(0),

6
src/NDS.cpp
View File

@ -79,8 +79,6 @@ NDS* NDS::Current = nullptr;
NDS::NDS() noexcept : NDS::NDS() noexcept :
NDS( NDS(
NDSArgs { NDSArgs {
nullptr,
nullptr,
std::make_unique<ARM9BIOSImage>(bios_arm9_bin), std::make_unique<ARM9BIOSImage>(bios_arm9_bin),
std::make_unique<ARM7BIOSImage>(bios_arm7_bin), std::make_unique<ARM7BIOSImage>(bios_arm7_bin),
Firmware(0), Firmware(0),
@ -102,8 +100,8 @@ NDS::NDS(NDSArgs&& args, int type, void* userdata) noexcept :
SPI(*this, std::move(args.Firmware)), SPI(*this, std::move(args.Firmware)),
RTC(*this), RTC(*this),
Wifi(*this), Wifi(*this),
NDSCartSlot(*this, std::move(args.NDSROM)), NDSCartSlot(*this, nullptr),
GBACartSlot(*this, type == 1 ? nullptr : std::move(args.GBAROM)), GBACartSlot(*this, nullptr),
AREngine(*this), AREngine(*this),
ARM9(*this, args.GDB, args.JIT.has_value()), ARM9(*this, args.GDB, args.JIT.has_value()),
ARM7(*this, args.GDB, args.JIT.has_value()), ARM7(*this, args.GDB, args.JIT.has_value()),

6
src/frontend/qt_sdl/EmuInstance.cpp
View File

@ -1296,10 +1296,6 @@ bool EmuInstance::updateConsole() noexcept
#endif #endif
NDSArgs ndsargs { NDSArgs ndsargs {
//std::move(nextndscart),
//std::move(nextgbacart),
nullptr,
nullptr,
std::move(arm9bios), std::move(arm9bios),
std::move(arm7bios), std::move(arm7bios),
std::move(*firmware), std::move(*firmware),
@ -1313,8 +1309,6 @@ bool EmuInstance::updateConsole() noexcept
std::optional<DSiArgs> dsiargs = std::nullopt; std::optional<DSiArgs> dsiargs = std::nullopt;
if (consoleType == 1) if (consoleType == 1)
{ {
ndsargs.GBAROM = nullptr;
auto arm7ibios = loadDSiARM7BIOS(); auto arm7ibios = loadDSiARM7BIOS();
if (!arm7ibios) if (!arm7ibios)
return false; return false;