From 88072a02c523e26390af6bd726608b3e567f996f Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Thu, 9 Nov 2023 12:57:16 -0500 Subject: Move NDSCart-related global state into objects (#1871) * Move NDSCart-related global state into objects - RAII will now do the heavy lifting - Mark some methods as const or noexcept * Move GBACart-related global state into objects (#1870) - RAII will now do the heavy lifting - Mark some methods as const or noexcept - Once the `NDS` object is finalized, most of these `assert`s can go away * Make AREngine::RunCheat public (#1872) - I use it directly in melonDS DS to apply single cheats without using ARCodeFile - Before the AREngine refactor I could just redeclare the function in my code - Now I can't --- src/frontend/qt_sdl/ROMInfoDialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/frontend/qt_sdl') diff --git a/src/frontend/qt_sdl/ROMInfoDialog.cpp b/src/frontend/qt_sdl/ROMInfoDialog.cpp index 2c1acee..b381803 100644 --- a/src/frontend/qt_sdl/ROMInfoDialog.cpp +++ b/src/frontend/qt_sdl/ROMInfoDialog.cpp @@ -43,8 +43,8 @@ ROMInfoDialog::ROMInfoDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ROMI ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose); - const NDSBanner* banner = NDSCart::Cart->Banner(); - const NDSHeader& header = NDSCart::Cart->GetHeader(); + const NDSBanner* banner = NDS::NDSCartSlot->GetCart()->Banner(); + const NDSHeader& header = NDS::NDSCartSlot->GetCart()->GetHeader(); u32 iconData[32 * 32]; ROMManager::ROMIcon(banner->Icon, banner->Palette, iconData); iconImage = QImage(reinterpret_cast(iconData), 32, 32, QImage::Format_ARGB32).copy(); -- cgit v1.2.3