From f7224c3716123bf5ddb83030ff20747091b131be Mon Sep 17 00:00:00 2001 From: Justin Scofield <47263509+scawful@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:54:02 -0500 Subject: [PATCH] Switch DungeonObjectRenderer to SharedROM --- src/app/zelda3/dungeon/room_object.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/zelda3/dungeon/room_object.h b/src/app/zelda3/dungeon/room_object.h index 5d042248..8166f239 100644 --- a/src/app/zelda3/dungeon/room_object.h +++ b/src/app/zelda3/dungeon/room_object.h @@ -19,7 +19,7 @@ namespace app { namespace zelda3 { namespace dungeon { -class DungeonObjectRenderer { +class DungeonObjectRenderer : public SharedROM { public: struct PseudoVram { std::vector sheets; @@ -36,15 +36,16 @@ class DungeonObjectRenderer { // } } - void RenderObjectsAsBitmaps(ROM& rom) { - memory_.Initialize(rom.vector()); + void RenderObjectsAsBitmaps() { + rom_data_ = rom()->vector(); + memory_.Initialize(rom_data_); cpu.Init(); auto subtype1_ptr = core::subtype1_tiles; auto subtype1_routine_ptr = core::subtype1_tiles + 0x200; std::array routine_ptrs; for (int i = 0; i < 256; i++) { - uint16_t actual_ptr = rom.toint16(subtype1_routine_ptr + (i * 2)); + uint16_t actual_ptr = rom()->toint16(subtype1_routine_ptr + (i * 2)); routine_ptrs[i] = actual_ptr; std::cout << std::hex << routine_ptrs[i] << std::endl; }