diff options
author | Jesse Talavera-Greenberg <jesse@jesse.tg> | 2023-11-08 16:21:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-08 22:21:21 +0100 |
commit | 8b47178add1e78da5ff96b335ecac73f34f4a8e9 (patch) | |
tree | 23bf7bad0aec69c3533ca22856dc24b96e1690b0 /src/NDS.h | |
parent | b4ff911fa357dd4a3572ff55373f8ddcd3f6f5ad (diff) |
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
Diffstat (limited to 'src/NDS.h')
-rw-r--r-- | src/NDS.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -20,11 +20,13 @@ #define NDS_H #include <string> +#include <memory> #include <functional> #include "Platform.h" #include "Savestate.h" #include "types.h" +#include "GBACart.h" // when touching the main loop/timing code, pls test a lot of shit // with this enabled, to make sure it doesn't desync @@ -257,7 +259,7 @@ extern class SPU* SPU; extern class SPIHost* SPI; extern class RTC* RTC; extern class Wifi* Wifi; - +extern std::unique_ptr<GBACart::GBACartSlot> GBACartSlot; extern class AREngine* AREngine; const u32 ARM7WRAMSize = 0x10000; |