remove old graphics bin from ow editor
This commit is contained in:
@@ -71,8 +71,6 @@ absl::Status OverworldEditor::Update() {
|
|||||||
gfx_group_editor_.InitBlockset(&tile16_blockset_bmp_);
|
gfx_group_editor_.InitBlockset(&tile16_blockset_bmp_);
|
||||||
RETURN_IF_ERROR(LoadEntranceTileTypes(*rom()));
|
RETURN_IF_ERROR(LoadEntranceTileTypes(*rom()));
|
||||||
all_gfx_loaded_ = true;
|
all_gfx_loaded_ = true;
|
||||||
} else if (!rom()->is_loaded() && all_gfx_loaded_) {
|
|
||||||
Shutdown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
RETURN_IF_ERROR(UpdateFullscreenCanvas());
|
RETURN_IF_ERROR(UpdateFullscreenCanvas());
|
||||||
@@ -1593,8 +1591,6 @@ void OverworldEditor::DrawOverworldSprites() {
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
absl::Status OverworldEditor::LoadGraphics() {
|
absl::Status OverworldEditor::LoadGraphics() {
|
||||||
graphics_bin_ = rom()->graphics_bin();
|
|
||||||
|
|
||||||
// Load the Link to the Past overworld.
|
// Load the Link to the Past overworld.
|
||||||
RETURN_IF_ERROR(overworld_.Load(*rom()))
|
RETURN_IF_ERROR(overworld_.Load(*rom()))
|
||||||
palette_ = overworld_.AreaPalette();
|
palette_ = overworld_.AreaPalette();
|
||||||
|
|||||||
@@ -260,7 +260,6 @@ class OverworldEditor : public Editor,
|
|||||||
gfx::Bitmap all_gfx_bmp;
|
gfx::Bitmap all_gfx_bmp;
|
||||||
|
|
||||||
gfx::BitmapTable maps_bmp_;
|
gfx::BitmapTable maps_bmp_;
|
||||||
gfx::BitmapTable graphics_bin_;
|
|
||||||
gfx::BitmapTable current_graphics_set_;
|
gfx::BitmapTable current_graphics_set_;
|
||||||
gfx::BitmapTable sprite_previews_;
|
gfx::BitmapTable sprite_previews_;
|
||||||
|
|
||||||
|
|||||||
@@ -281,8 +281,6 @@ class BitmapManager {
|
|||||||
if (it != bitmap_cache_.end()) {
|
if (it != bitmap_cache_.end()) {
|
||||||
return it->second;
|
return it->second;
|
||||||
}
|
}
|
||||||
std::cout << absl::StrCat("Bitmap with id ", id, " not found.")
|
|
||||||
<< std::endl;
|
|
||||||
return bitmap_cache_.begin()->second;
|
return bitmap_cache_.begin()->second;
|
||||||
}
|
}
|
||||||
std::shared_ptr<gfx::Bitmap> const &shared_bitmap(int id) {
|
std::shared_ptr<gfx::Bitmap> const &shared_bitmap(int id) {
|
||||||
|
|||||||
Reference in New Issue
Block a user