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

Refactor dungeon entrance loading and clean up unused renderer object

Browse Source
This commit is contained in:
scawful
2025-05-08 22:35:10 -04:00
parent 68c1ab2f02
commit 179ab5bc40
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/editor/dungeon/dungeon_editor.cc
View File

@@ -70,11 +70,11 @@ absl::Status DungeonEditor::Load() {
LoadDungeonRoomSize(); LoadDungeonRoomSize();
// LoadRoomEntrances // LoadRoomEntrances
for (int i = 0; i < 0x07; ++i) { for (int i = 0; i < 0x07; ++i) {
entrances_[i] = zelda3::RoomEntrance(*rom(), i, true); entrances_[i] = zelda3::RoomEntrance(rom(), i, true);
} }
for (int i = 0; i < 0x85; ++i) { for (int i = 0; i < 0x85; ++i) {
entrances_[i + 0x07] = zelda3::RoomEntrance(*rom(), i, false); entrances_[i + 0x07] = zelda3::RoomEntrance(rom(), i, false);
} }
// Load the palette group and palette for the dungeon // Load the palette group and palette for the dungeon

2
src/app/editor/dungeon/dungeon_editor.h
View File

@@ -123,7 +123,7 @@ class DungeonEditor : public Editor {
std::array<zelda3::Room, 0x128> rooms_ = {}; std::array<zelda3::Room, 0x128> rooms_ = {};
std::array<zelda3::RoomEntrance, 0x8C> entrances_ = {}; std::array<zelda3::RoomEntrance, 0x8C> entrances_ = {};
zelda3::DungeonObjectRenderer object_renderer_; // zelda3::DungeonObjectRenderer object_renderer_;
absl::flat_hash_map<uint16_t, int> spriteset_usage_; absl::flat_hash_map<uint16_t, int> spriteset_usage_;
absl::flat_hash_map<uint16_t, int> blockset_usage_; absl::flat_hash_map<uint16_t, int> blockset_usage_;

2
src/app/editor/message/message_editor.cc
View File

@@ -69,7 +69,7 @@ void MessageEditor::Initialize() {
current_font_gfx16_data_.reserve(kCurrentMessageWidth * current_font_gfx16_data_.reserve(kCurrentMessageWidth *
kCurrentMessageHeight); kCurrentMessageHeight);
std::fill(current_font_gfx16_data_.begin(), current_font_gfx16_data_.end(), std::fill(current_font_gfx16_data_.begin(), current_font_gfx16_data_.end(),
0); 0);
// 8bpp // 8bpp