From a8b381a0b5024d559a5216f77021bb1af6c068f2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 11 Mar 2020 19:33:22 -0400 Subject: [PATCH] Match tileset names with underscores and unknown paths --- src/project.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/project.cpp b/src/project.cpp index f2a2ee6e..3783f4b2 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -1291,8 +1291,9 @@ void Project::loadTilesetAssets(Tileset* tileset) { if (tileset->name.isNull()) { return; } + QRegularExpression re("([a-z])([A-Z])"); QString tilesetName = tileset->name; - QString dir_path = root + "/data/tilesets/" + category + "/" + tilesetName.replace("gTileset_", "").toLower(); + QString dir_path = root + "/data/tilesets/" + category + "/" + tilesetName.replace("gTileset_", "").replace(re, "\\1_\\2").toLower(); QList *graphics = parser.parseAsm("data/tilesets/graphics.inc"); QStringList *tiles_values = parser.getLabelValues(graphics, tileset->tiles_label);