From aced0bef691dbc41bdd39b6e62662d2436877a4b Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Sat, 6 Jan 2024 14:59:48 +0100 Subject: Rename metaTiles Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles. --- tools/src/asset_processor/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/src/asset_processor/main.cpp') diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp index eddce2b0..4460f6fc 100644 --- a/tools/src/asset_processor/main.cpp +++ b/tools/src/asset_processor/main.cpp @@ -8,7 +8,7 @@ #include "assets/midi.h" #include "assets/palette.h" #include "assets/spriteframe.h" -#include "assets/tileset.h" +#include "assets/subtileset.h" #include "offsets.h" #include #include @@ -264,8 +264,8 @@ std::unique_ptr getAssetHandlerByType(const std::filesystem::path& pa } std::unique_ptr assetHandler; - if (type == "tileset") { - assetHandler = std::make_unique(path, start, size, asset); + if (type == "subtileset") { + assetHandler = std::make_unique(path, start, size, asset); } else if (type == "animation") { assetHandler = std::make_unique(path, start, size, asset); } else if (type == "sprite_frame") { @@ -280,8 +280,8 @@ std::unique_ptr getAssetHandlerByType(const std::filesystem::path& pa assetHandler = std::make_unique(path, start, size, asset); } else if (type == "palette") { assetHandler = std::make_unique(path, start, size, asset); - } else if (type == "metatilemap" || - type == "metatileset_types" || type == "metatileset" || + } else if (type == "tilemap" || + type == "tileset_types" || type == "tileset" || type == "map_mapping1" || type == "map_mapping2" || type == "map_collision") { assetHandler = std::make_unique(path, start, size, asset); -- cgit v1.2.3