Match tileset names with underscores and unknown paths

This commit is contained in:
GriffinR 2020-03-11 19:33:22 -04:00
parent a2f38341f5
commit a8b381a0b5

View file

@ -1291,8 +1291,9 @@ void Project::loadTilesetAssets(Tileset* tileset) {
if (tileset->name.isNull()) { if (tileset->name.isNull()) {
return; return;
} }
QRegularExpression re("([a-z])([A-Z])");
QString tilesetName = tileset->name; 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<QStringList> *graphics = parser.parseAsm("data/tilesets/graphics.inc"); QList<QStringList> *graphics = parser.parseAsm("data/tilesets/graphics.inc");
QStringList *tiles_values = parser.getLabelValues(graphics, tileset->tiles_label); QStringList *tiles_values = parser.getLabelValues(graphics, tileset->tiles_label);