scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Inventory class to remove inheritance from SharedRom and add ROM pointer management. Update LoadDungeonMapGfxFromBinary to simplify palette setting logic, enhancing code clarity and maintainability.

Browse Source
This commit is contained in:
scawful
2025-05-03 17:24:43 -04:00
parent 6e09630733
commit d98e8bc324
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/zelda3/screen/dungeon_map.cc
View File

@@ -34,7 +34,7 @@ absl::Status LoadDungeonMapGfxFromBinary(Rom &rom,
gfx_sheets.emplace_back(converted_bin.begin() + (i * 0x1000), gfx_sheets.emplace_back(converted_bin.begin() + (i * 0x1000),
converted_bin.begin() + ((i + 1) * 0x1000)); converted_bin.begin() + ((i + 1) * 0x1000));
sheets[i] = gfx::Bitmap(128, 32, 8, gfx_sheets[i]); sheets[i] = gfx::Bitmap(128, 32, 8, gfx_sheets[i]);
RETURN_IF_ERROR(sheets[i].SetPalette(*rom.mutable_dungeon_palette(3))); sheets[i].SetPalette(*rom.mutable_dungeon_palette(3));
core::Renderer::GetInstance().RenderBitmap(&sheets[i]); core::Renderer::GetInstance().RenderBitmap(&sheets[i]);
} }
} else { } else {

6
src/app/zelda3/screen/inventory.h
View File

@@ -13,7 +13,7 @@ namespace zelda3 {
constexpr int kInventoryStart = 0x6564A; constexpr int kInventoryStart = 0x6564A;
constexpr int kBowItemPos = 0x6F631; constexpr int kBowItemPos = 0x6F631;
class Inventory : public SharedRom { class Inventory {
public: public:
absl::Status Create(); absl::Status Create();
@@ -21,6 +21,9 @@ class Inventory : public SharedRom {
auto &tilesheet() { return tilesheets_bmp_; } auto &tilesheet() { return tilesheets_bmp_; }
auto &palette() { return palette_; } auto &palette() { return palette_; }
void LoadRom(Rom *rom) { rom_ = rom; }
auto rom() { return rom_; }
private: private:
absl::Status BuildTileset(); absl::Status BuildTileset();
@@ -32,6 +35,7 @@ class Inventory : public SharedRom {
gfx::Bitmap tilesheets_bmp_; gfx::Bitmap tilesheets_bmp_;
gfx::SnesPalette palette_; gfx::SnesPalette palette_;
Rom *rom_;
gui::Canvas canvas_; gui::Canvas canvas_;
std::vector<gfx::TileInfo> tiles_; std::vector<gfx::TileInfo> tiles_;
}; };