Update overworld loading logic to use Rom pointers directly; adjust test cases for consistency.

This commit is contained in:
scawful
2025-04-12 11:29:45 -04:00
parent 42cfb3bcb2
commit f43328a1ae
3 changed files with 5 additions and 5 deletions

View File

@@ -157,8 +157,8 @@ zelda3_overworld *yaze_load_overworld(const zelda3_rom *rom) {
}
yaze::Rom *internal_rom = static_cast<yaze::Rom *>(rom->impl);
auto internal_overworld = new yaze::zelda3::Overworld(*internal_rom);
if (!internal_overworld->Load(*internal_rom).ok()) {
auto internal_overworld = new yaze::zelda3::Overworld(internal_rom);
if (!internal_overworld->Load(internal_rom).ok()) {
return nullptr;
}

View File

@@ -16,9 +16,9 @@ add_executable(
yaze_test
yaze_test.cc
rom_test.cc
test_editor.cc
gfx/compression_test.cc
gfx/snes_palette_test.cc
integration/test_editor.cc
zelda3/message_test.cc
zelda3/overworld_test.cc
zelda3/sprite_builder_test.cc

View File

@@ -20,12 +20,12 @@ class OverworldTest : public ::testing::Test, public SharedRom {
}
void TearDown() override {}
zelda3::Overworld overworld_{*rom()};
zelda3::Overworld overworld_{rom()};
};
TEST_F(OverworldTest, OverworldLoadNoRomDataError) {
Rom rom;
EXPECT_THAT(overworld_.Load(rom),
EXPECT_THAT(overworld_.Load(&rom),
StatusIs(absl::StatusCode::kInvalidArgument));
}