From 80655313d185517dcb53315a942be91d0c087109 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 11 Mar 2025 21:26:55 -0400
Subject: [PATCH] Refactor EditorManager to extract LoadAssets method for
 improved code organization and readability

---
 src/app/editor/editor_manager.cc | 29 ++++++++++++++++-------------
 src/app/editor/editor_manager.h  |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/app/editor/editor_manager.cc b/src/app/editor/editor_manager.cc
index 27036614..945c3714 100644
--- a/src/app/editor/editor_manager.cc
+++ b/src/app/editor/editor_manager.cc
@@ -701,16 +701,20 @@ void EditorManager::LoadRom() {
     manager.Load();
     manager.AddFile(file_name);
     manager.Save();
-    auto load_rom_assets = [&]() -> absl::Status {
-      auto &sheet_manager = GraphicsSheetManager::GetInstance();
-      ASSIGN_OR_RETURN(*sheet_manager.mutable_gfx_sheets(),
-                       LoadAllGraphicsData(*rom()))
-      RETURN_IF_ERROR(overworld_editor_.LoadGraphics());
-      return absl::OkStatus();
-    };
-    if (!load_rom_assets().ok()) {
-      status_ = load_rom_assets();
-    }
+    LoadAssets();
+  }
+}
+
+void EditorManager::LoadAssets() {
+  auto load_rom_assets = [&]() -> absl::Status {
+    auto &sheet_manager = GraphicsSheetManager::GetInstance();
+    ASSIGN_OR_RETURN(*sheet_manager.mutable_gfx_sheets(),
+                     LoadAllGraphicsData(*rom()))
+    RETURN_IF_ERROR(overworld_editor_.LoadGraphics());
+    return absl::OkStatus();
+  };
+  if (!load_rom_assets().ok()) {
+    status_ = load_rom_assets();
   }
 }
 
@@ -739,6 +743,7 @@ void EditorManager::OpenRomOrProject(const std::string &filename) {
   } else {
     status_ = rom()->LoadFromFile(filename);
     current_rom_ = rom();
+    LoadAssets();
   }
 }
 
@@ -756,11 +761,9 @@ absl::Status EditorManager::OpenProject() {
   manager.AddFile(current_project_.filepath + "/" + current_project_.name +
                   ".yaze");
   manager.Save();
-
   assembly_editor_.OpenFolder(current_project_.code_folder_);
-
   current_project_.project_opened_ = true;
-
+  LoadAssets();
   return absl::OkStatus();
 }
 
diff --git a/src/app/editor/editor_manager.h b/src/app/editor/editor_manager.h
index 2e22bdfe..f3152ae6 100644
--- a/src/app/editor/editor_manager.h
+++ b/src/app/editor/editor_manager.h
@@ -65,8 +65,8 @@ class EditorManager : public SharedRom {
   void DrawPopups();
 
   void LoadRom();
+  void LoadAssets();
   void SaveRom();
-
   void OpenRomOrProject(const std::string &filename);
   absl::Status OpenProject();
   void SaveProject();