Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-27 19:16:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow spaces in C INCBINS

Browse Source
This commit is contained in:
garak
2019-06-03 23:48:39 -04:00
committed by huderlem
parent 889efd752f
commit a240bf5038
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/parseutil.cpp
View File

@@ -243,7 +243,7 @@ QString ParseUtil::readCIncbin(QString filename, QString label) {
"\\b%1\\b"
"\\s*\\[?\\s*\\]?\\s*=\\s*"
"INCBIN_[US][0-9][0-9]?"
"\\(\"([^\"]*)\"\\)").arg(label));
"\\(\\s*\"([^\"]*)\"\\s*\\)").arg(label));
int pos = re->indexIn(text);
if (pos != -1) {
@@ -322,7 +322,7 @@ QStringList ParseUtil::readCArray(QString filename, QString label) {
QStringList split = body.split(',');
for (QString item : split) {
item = item.trimmed();
if (!item.contains(QRegularExpression("[^A-Za-z0-9_&()]"))) list.append(item);
if (!item.contains(QRegularExpression("[^A-Za-z0-9_&()\\s]"))) list.append(item);
// do not print error info here because this is called dozens of times
}
}