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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/yaze.cc
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); yaze::Rom *internal_rom = static_cast<yaze::Rom *>(rom->impl);
auto internal_overworld = new yaze::zelda3::Overworld(*internal_rom); auto internal_overworld = new yaze::zelda3::Overworld(internal_rom);
if (!internal_overworld->Load(*internal_rom).ok()) { if (!internal_overworld->Load(internal_rom).ok()) {
return nullptr; return nullptr;
} }

2
test/CMakeLists.txt
View File

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

4
test/zelda3/overworld_test.cc
View File

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