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

Rename staircase_rooms_vec_ to z3_staircases for clarity and update related usages

Browse Source
This commit is contained in:
scawful
2024-11-10 22:14:15 -05:00
parent c640c0af66
commit 0f3fd1fb5d
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/zelda3/dungeon/room.cc
View File

@@ -301,7 +301,7 @@ void Room::LoadObjects() {
LoadChests(); LoadChests();
staircase_rooms_vec_.clear(); z3_staircases_.clear();
int nbr_of_staircase = 0; int nbr_of_staircase = 0;
int pos = objects_location + 2; int pos = objects_location + 2;
@@ -375,7 +375,7 @@ void Room::LoadObjects() {
if (nbr_of_staircase < 4) { if (nbr_of_staircase < 4) {
tile_objects_.back().set_options(ObjectOption::Stairs | tile_objects_.back().set_options(ObjectOption::Stairs |
tile_objects_.back().options()); tile_objects_.back().options());
staircase_rooms_vec_.push_back(z3_staircase( z3_staircases_.push_back(z3_staircase(
posX, posY, posX, posY,
absl::StrCat("To ", staircase_rooms_[nbr_of_staircase]) absl::StrCat("To ", staircase_rooms_[nbr_of_staircase])
.data())); .data()));
@@ -383,7 +383,7 @@ void Room::LoadObjects() {
} else { } else {
tile_objects_.back().set_options(ObjectOption::Stairs | tile_objects_.back().set_options(ObjectOption::Stairs |
tile_objects_.back().options()); tile_objects_.back().options());
staircase_rooms_vec_.push_back(z3_staircase(posX, posY, "To ???")); z3_staircases_.push_back(z3_staircase(posX, posY, "To ???"));
} }
} }
} }

11
src/app/zelda3/dungeon/room.h
View File

@@ -159,10 +159,13 @@ class Room : public SharedRom {
int64_t room_size_pointer_; int64_t room_size_pointer_;
std::array<uint8_t, 16> blocks_; std::array<uint8_t, 16> blocks_;
std::array<uchar, 16> chest_list_;
std::array<gfx::Bitmap, 3> background_bmps_; std::array<gfx::Bitmap, 3> background_bmps_;
std::vector<RoomObject> tile_objects_;
std::vector<zelda3::Sprite> sprites_; std::vector<zelda3::Sprite> sprites_;
std::vector<z3_staircase> staircase_rooms_vec_; std::vector<z3_staircase> z3_staircases_;
std::vector<z3_chest_data> chests_in_room_;
z3_dungeon_background2 bg2_; z3_dungeon_background2 bg2_;
z3_dungeon_destination pits_; z3_dungeon_destination pits_;
@@ -170,12 +173,6 @@ class Room : public SharedRom {
z3_dungeon_destination stair2_; z3_dungeon_destination stair2_;
z3_dungeon_destination stair3_; z3_dungeon_destination stair3_;
z3_dungeon_destination stair4_; z3_dungeon_destination stair4_;
std::array<uchar, 16> chest_list_;
std::vector<z3_chest_data> chests_in_room_;
std::vector<RoomObject> tile_objects_;
std::vector<int> room_addresses_;
}; };
constexpr std::string_view kRoomNames[] = { constexpr std::string_view kRoomNames[] = {