From b9622c880cac7678a64347b36c6de40ae99170df Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 13 Aug 2024 21:57:00 -0400
Subject: [PATCH] Refactor DungeonEditor to use std::array for gfx sheets

---
 src/app/editor/dungeon/dungeon_editor.cc | 2 +-
 src/app/editor/dungeon/dungeon_editor.h  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/editor/dungeon/dungeon_editor.cc b/src/app/editor/dungeon/dungeon_editor.cc
index 9b0e9caa..b069f313 100644
--- a/src/app/editor/dungeon/dungeon_editor.cc
+++ b/src/app/editor/dungeon/dungeon_editor.cc
@@ -109,7 +109,7 @@ absl::Status DungeonEditor::Initialize() {
   ASSIGN_OR_RETURN(current_palette_group_,
                    gfx::CreatePaletteGroupFromLargePalette(full_palette_));
 
-  graphics_bin_ = *rom()->mutable_bitmap_manager();
+  graphics_bin_ = rom()->gfx_sheets();
   // Create a vector of pointers to the current block bitmaps
   for (int block : rooms_[current_room_id_].blocks()) {
     room_gfx_sheets_.emplace_back(&graphics_bin_[block]);
diff --git a/src/app/editor/dungeon/dungeon_editor.h b/src/app/editor/dungeon/dungeon_editor.h
index fdf52529..5b78804c 100644
--- a/src/app/editor/dungeon/dungeon_editor.h
+++ b/src/app/editor/dungeon/dungeon_editor.h
@@ -1,8 +1,6 @@
 #ifndef YAZE_APP_EDITOR_DUNGEONEDITOR_H
 #define YAZE_APP_EDITOR_DUNGEONEDITOR_H
 
-#include "imgui/imgui.h"
-
 #include "app/core/common.h"
 #include "app/core/labeling.h"
 #include "app/editor/graphics/gfx_group_editor.h"
@@ -11,6 +9,7 @@
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
 #include "app/rom.h"
+#include "imgui/imgui.h"
 #include "zelda3/dungeon/room.h"
 #include "zelda3/dungeon/room_entrance.h"
 #include "zelda3/dungeon/room_object.h"
@@ -120,7 +119,7 @@ class DungeonEditor : public Editor,
   gui::Canvas object_canvas_;
 
   gfx::Bitmap room_gfx_bmp_;
-  gfx::BitmapManager graphics_bin_;
+  std::array<gfx::Bitmap, kNumGfxSheets> graphics_bin_;
 
   std::vector<gfx::Bitmap*> room_gfx_sheets_;
   std::vector<zelda3::dungeon::Room> rooms_;