From ed2777c39732cdbcbf6c3e8ff897db704495807c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 22 May 2020 15:52:34 -0400 Subject: [PATCH 1/2] Monitor metatile_labels.h --- src/project.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/project.cpp b/src/project.cpp index 78a56fd6..01034201 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -1719,7 +1719,9 @@ void Project::loadTilesetMetatiles(Tileset* tileset) { void Project::loadTilesetMetatileLabels(Tileset* tileset) { QString tilesetPrefix = QString("METATILE_%1_").arg(QString(tileset->name).replace("gTileset_", "")); - QMap labels = parser.readCDefines("include/constants/metatile_labels.h", QStringList() << tilesetPrefix); + QString metatileLabelsFilename = "include/constants/metatile_labels.h"; + fileWatcher.addPath(root + "/" + metatileLabelsFilename); + QMap labels = parser.readCDefines(metatileLabelsFilename, QStringList() << tilesetPrefix); for (QString labelName : labels.keys()) { int metatileId = labels[labelName]; From febc788097cede726c85d06db53fe5923d4ae6bd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 22 May 2020 16:02:11 -0400 Subject: [PATCH 2/2] Ignore metatile_labels when saving --- src/project.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/project.cpp b/src/project.cpp index 01034201..4339a1d8 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -1026,7 +1026,8 @@ void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *second QMap defines; bool definesFileModified = false; - defines = parser.readCDefines("include/constants/metatile_labels.h", (QStringList() << "METATILE_")); + QString metatileLabelsFilename = "include/constants/metatile_labels.h"; + defines = parser.readCDefines(metatileLabelsFilename, (QStringList() << "METATILE_")); // Purge old entries from the file. QStringList definesToRemove; @@ -1097,8 +1098,8 @@ void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *second outputText += "\n#endif // GUARD_METATILE_LABELS_H\n"; - - saveTextFile(root + "/include/constants/metatile_labels.h", outputText); + ignoreWatchedFileTemporarily(root + "/" + metatileLabelsFilename); + saveTextFile(root + "/" + metatileLabelsFilename, outputText); } void Project::saveTilesetMetatileAttributes(Tileset *tileset) {