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

Revert changes to readCIncbin

Browse source
This commit is contained in:
GriffinR 2023-02-06 19:19:46 -05:00
parent 495532c032
commit e710567400
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/parseutil.cpp
View file

@ -263,14 +263,14 @@ QString ParseUtil::readCIncbin(const QString &filename, const QString &label) {
this->text = readTextFile(this->root + "/" + filename); this->text = readTextFile(this->root + "/" + filename);
int start = this->text.indexOf(QRegularExpression(label + "\b")); QRegularExpression re(QString(
if (start < 0) return path; "\\b%1\\b"
int end = this->text.indexOf(';', start); "\\s*\\[?\\s*\\]?\\s*=\\s*"
QString incbinText = this->text.mid(start, end - start); "INCBIN_[US][0-9][0-9]?"
"\\(\\s*\"([^\"]*)\"\\s*\\)").arg(label));
static const QRegularExpression re_incbin("\\s*\\[?\\s*\\]?\\s*=\\s*INCBIN_[US][0-9][0-9]?\\(\\s*\\\"(?<path>[^\\\"]*)\\\"\\s*\\)");
QRegularExpressionMatch match; QRegularExpressionMatch match;
qsizetype pos = incbinText.indexOf(re_incbin, 0, &match); qsizetype pos = this->text.indexOf(re, 0, &match);
if (pos != -1) { if (pos != -1) {
path = match.captured(1); path = match.captured(1);
} }