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

make use of status macros

Browse Source
This commit is contained in:
scawful
2022-08-23 14:52:44 -05:00
parent 04fd077578
commit eb70044e8a
5 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/zelda3/overworld.cc
View File

@@ -32,11 +32,7 @@ absl::Status Overworld::Load(ROM &rom, uchar *ow_blockset) {
AssembleMap32Tiles();
AssembleMap16Tiles();
auto decompression_status = DecompressAllMapTiles();
if (!decompression_status.ok()) {
std::cout << decompression_status.ToString() << std::endl;
return decompression_status;
}
RETURN_IF_ERROR(DecompressAllMapTiles())
for (int map_index = 0; map_index < core::kNumOverworldMaps; ++map_index)
overworld_maps_.emplace_back(map_index, rom_, tiles16);

11
src/app/zelda3/overworld_map.cc
View File

@@ -56,15 +56,8 @@ absl::Status OverworldMap::BuildMap(int count, int game_state, int world,
}
LoadAreaGraphics(game_state, world_index);
auto tileset_status = BuildTileset();
if (!tileset_status.ok()) {
return tileset_status;
}
auto map_status = BuildTiles16Gfx(count);
if (!map_status.ok()) {
return map_status;
}
RETURN_IF_ERROR(BuildTileset())
RETURN_IF_ERROR(BuildTiles16Gfx(count))
// int superY = ((index_ - (world * 64)) / 8);
// int superX = index_ - (world * 64) - (superY * 8);