make use of status macros

2022-08-23 14:52:44 -05:00
parent 04fd077578
commit eb70044e8a
5 changed files with 23 additions and 49 deletions
--- a/src/app/zelda3/overworld_map.cc
+++ b/src/app/zelda3/overworld_map.cc
@@ -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);