move OWBlockset and OWMapTiles
This commit is contained in:
@@ -411,7 +411,7 @@ void MasterEditor::DrawYazeMenu() {
|
||||
}
|
||||
PopStyleColor();
|
||||
|
||||
Text("yaze v%s", core::kYazeVersion.c_str());
|
||||
Text("yaze v%s", core::kYazeVersion.data());
|
||||
|
||||
EndMenuBar();
|
||||
}
|
||||
|
||||
@@ -1314,7 +1314,7 @@ absl::Status OverworldEditor::LoadAnimatedMaps() {
|
||||
map.DrawAnimatedTiles();
|
||||
RETURN_IF_ERROR(map.BuildTileset());
|
||||
RETURN_IF_ERROR(map.BuildTiles16Gfx(overworld_.tiles16().size()));
|
||||
OWBlockset blockset;
|
||||
zelda3::OWBlockset blockset;
|
||||
if (current_world_ == 0) {
|
||||
blockset = overworld_.map_tiles().light_world;
|
||||
} else if (current_world_ == 1) {
|
||||
|
||||
@@ -288,7 +288,7 @@ class OverworldEditor : public Editor,
|
||||
gfx::BitmapTable sprite_previews_;
|
||||
gfx::BitmapTable animated_maps_;
|
||||
|
||||
OWBlockset refresh_blockset_;
|
||||
zelda3::OWBlockset refresh_blockset_;
|
||||
|
||||
gui::zeml::Node layout_node_;
|
||||
absl::Status status_;
|
||||
|
||||
Reference in New Issue
Block a user