atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #232 from GriffinRichards/monitor-labels

Browse source 
Monitor metatile_labels.h
This commit is contained in:
garak 2020-05-22 16:07:05 -04:00 committed by GitHub
commit aa2ce13551
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/project.cpp
View file

@ -1026,7 +1026,8 @@ void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *second
QMap<QString, int> defines; QMap<QString, int> defines;
bool definesFileModified = false; 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. // Purge old entries from the file.
QStringList definesToRemove; QStringList definesToRemove;
@ -1097,8 +1098,8 @@ void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *second
outputText += "\n#endif // GUARD_METATILE_LABELS_H\n"; outputText += "\n#endif // GUARD_METATILE_LABELS_H\n";
ignoreWatchedFileTemporarily(root + "/" + metatileLabelsFilename);
saveTextFile(root + "/include/constants/metatile_labels.h", outputText); saveTextFile(root + "/" + metatileLabelsFilename, outputText);
} }
void Project::saveTilesetMetatileAttributes(Tileset *tileset) { void Project::saveTilesetMetatileAttributes(Tileset *tileset) {
@ -1719,7 +1720,9 @@ void Project::loadTilesetMetatiles(Tileset* tileset) {
void Project::loadTilesetMetatileLabels(Tileset* tileset) { void Project::loadTilesetMetatileLabels(Tileset* tileset) {
QString tilesetPrefix = QString("METATILE_%1_").arg(QString(tileset->name).replace("gTileset_", "")); QString tilesetPrefix = QString("METATILE_%1_").arg(QString(tileset->name).replace("gTileset_", ""));
QMap<QString, int> labels = parser.readCDefines("include/constants/metatile_labels.h", QStringList() << tilesetPrefix); QString metatileLabelsFilename = "include/constants/metatile_labels.h";
fileWatcher.addPath(root + "/" + metatileLabelsFilename);
QMap<QString, int> labels = parser.readCDefines(metatileLabelsFilename, QStringList() << tilesetPrefix);
for (QString labelName : labels.keys()) { for (QString labelName : labels.keys()) {
int metatileId = labels[labelName]; int metatileId = labels[labelName];