remove dungeon namespace

This commit is contained in:
scawful
2024-12-29 16:14:20 -05:00
parent 8cf16906e6
commit 7e470f2b33
14 changed files with 43 additions and 34 deletions

View File

@@ -25,7 +25,7 @@ class DungeonRoomTest : public ::testing::Test, public SharedRom {
};
TEST_F(DungeonRoomTest, SingleRoomLoadOk) {
zelda3::dungeon::Room test_room(/*room_id=*/0);
zelda3::Room test_room(/*room_id=*/0);
test_room.LoadHeader();
// Do some assertions based on the output in ZS
test_room.LoadRoomFromROM();

View File

@@ -22,7 +22,7 @@ class OverworldTest : public ::testing::Test, public SharedRom {
}
void TearDown() override {}
zelda3::overworld::Overworld overworld_;
zelda3::Overworld overworld_;
};
TEST_F(OverworldTest, OverworldLoadNoRomDataError) {
@@ -48,9 +48,9 @@ TEST_F(OverworldTest, OverworldLoadRomDataOk) {
// Assert
EXPECT_TRUE(status.ok());
EXPECT_EQ(overworld_.overworld_maps().size(),
zelda3::overworld::kNumOverworldMaps);
zelda3::kNumOverworldMaps);
EXPECT_EQ(overworld_.tiles16().size(),
zelda3::overworld::kNumTile16Individual);
zelda3::kNumTile16Individual);
}
} // namespace zelda3