From c3c310a84c4a6e83f5a3152d3fb7a6886b7e62ab Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 13 Aug 2024 21:33:45 -0400 Subject: [PATCH] Deprecation bitmap_manager efforts --- src/app/editor/graphics/screen_editor.cc | 9 ++++----- src/app/zelda3/dungeon/object_renderer.cc | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/editor/graphics/screen_editor.cc b/src/app/editor/graphics/screen_editor.cc index 09595df2..3e19c0ba 100644 --- a/src/app/editor/graphics/screen_editor.cc +++ b/src/app/editor/graphics/screen_editor.cc @@ -332,11 +332,10 @@ void ScreenEditor::DrawDungeonMapsEditor() { if (!dungeon_maps_loaded_) { if (LoadDungeonMaps().ok()) { if (LoadDungeonMapTile16().ok()) { - auto bitmap_manager = rom()->mutable_bitmap_manager(); - sheets_.emplace(0, *bitmap_manager->mutable_bitmap(212)); - sheets_.emplace(1, *bitmap_manager->mutable_bitmap(213)); - sheets_.emplace(2, *bitmap_manager->mutable_bitmap(214)); - sheets_.emplace(3, *bitmap_manager->mutable_bitmap(215)); + sheets_.emplace(0, rom()->gfx_sheets()[212]); + sheets_.emplace(1, rom()->gfx_sheets()[213]); + sheets_.emplace(2, rom()->gfx_sheets()[214]); + sheets_.emplace(3, rom()->gfx_sheets()[215]); dungeon_maps_loaded_ = true; } else { ImGui::Text("Failed to load dungeon map tile16"); diff --git a/src/app/zelda3/dungeon/object_renderer.cc b/src/app/zelda3/dungeon/object_renderer.cc index 3478fda1..adc9fbee 100644 --- a/src/app/zelda3/dungeon/object_renderer.cc +++ b/src/app/zelda3/dungeon/object_renderer.cc @@ -137,8 +137,7 @@ void DungeonObjectRenderer::UpdateObjectBitmap() { int x = column * 8; int y = row * 8; - auto sheet = - rom()->mutable_bitmap_manager()->at(vram_.sheets[sheet_number]); + auto sheet = rom()->mutable_gfx_sheets()->at(vram_.sheets[sheet_number]); // Copy the tile from VRAM using the read tile_id sheet.Get8x8Tile(tile_id, x, y, tilemap_, tilemap_offset);