From eb51c43d7d4acde847ef2cdedcd20a480dad2890 Mon Sep 17 00:00:00 2001 From: scawful Date: Thu, 30 May 2024 18:25:14 -0400 Subject: [PATCH] remove old graphics bin from ow editor --- src/app/editor/overworld_editor.cc | 4 ---- src/app/editor/overworld_editor.h | 1 - src/app/gfx/bitmap.h | 2 -- 3 files changed, 7 deletions(-) diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc index 0bd51625..a4ce3581 100644 --- a/src/app/editor/overworld_editor.cc +++ b/src/app/editor/overworld_editor.cc @@ -71,8 +71,6 @@ absl::Status OverworldEditor::Update() { gfx_group_editor_.InitBlockset(&tile16_blockset_bmp_); RETURN_IF_ERROR(LoadEntranceTileTypes(*rom())); all_gfx_loaded_ = true; - } else if (!rom()->is_loaded() && all_gfx_loaded_) { - Shutdown(); } RETURN_IF_ERROR(UpdateFullscreenCanvas()); @@ -1593,8 +1591,6 @@ void OverworldEditor::DrawOverworldSprites() { // ---------------------------------------------------------------------------- absl::Status OverworldEditor::LoadGraphics() { - graphics_bin_ = rom()->graphics_bin(); - // Load the Link to the Past overworld. RETURN_IF_ERROR(overworld_.Load(*rom())) palette_ = overworld_.AreaPalette(); diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h index 41837dca..e276a845 100644 --- a/src/app/editor/overworld_editor.h +++ b/src/app/editor/overworld_editor.h @@ -260,7 +260,6 @@ class OverworldEditor : public Editor, gfx::Bitmap all_gfx_bmp; gfx::BitmapTable maps_bmp_; - gfx::BitmapTable graphics_bin_; gfx::BitmapTable current_graphics_set_; gfx::BitmapTable sprite_previews_; diff --git a/src/app/gfx/bitmap.h b/src/app/gfx/bitmap.h index 03eaa132..94c19927 100644 --- a/src/app/gfx/bitmap.h +++ b/src/app/gfx/bitmap.h @@ -281,8 +281,6 @@ class BitmapManager { if (it != bitmap_cache_.end()) { return it->second; } - std::cout << absl::StrCat("Bitmap with id ", id, " not found.") - << std::endl; return bitmap_cache_.begin()->second; } std::shared_ptr const &shared_bitmap(int id) {