From 7777eac9f43014d3d13c8c414a16f7c2daee73d6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 12 Sep 2022 11:54:44 -0400 Subject: [PATCH] Silence errors about SECRET_BASE_GROUP --- src/project.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/project.cpp b/src/project.cpp index 0942c101..62f12185 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -2218,10 +2218,15 @@ bool Project::readSecretBaseIds() { if (!projectConfig.getEventSecretBaseEnabled()) return true; + // SECRET_BASE_GROUP is a function-like macro, which Porymap can't handle. + // Redefine it so Porymap won't produce spurious errors about failing to parse it. + QMap knownDefines = QMap(); + knownDefines.insert("SECRET_BASE_GROUP", 0); + QStringList prefixes("\\bSECRET_BASE_[A-Za-z0-9_]*_[0-9]+"); QString filename = "include/constants/secret_bases.h"; fileWatcher.addPath(root + "/" + filename); - secretBaseIds = parser.readCDefinesSorted(filename, prefixes); + secretBaseIds = parser.readCDefinesSorted(filename, prefixes, knownDefines); if (secretBaseIds.isEmpty()) { logError(QString("Failed to read secret base id constants from %1").arg(filename)); return false;