Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-12 03:45:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix new maps parsing scripts file too early

Browse Source
This commit is contained in:
GriffinR
2024-01-29 14:07:13 -05:00
parent d74affe0b9
commit ae341d144e
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/map.cpp
View File

@@ -27,7 +27,7 @@ Map::~Map() {
void Map::setName(QString mapName) {
name = mapName;
constantName = mapConstantFromName(mapName);
scriptsFileLabels = ParseUtil::getGlobalScriptLabels(this->getScriptsFilePath());
scriptsLoaded = false;
}
QString Map::mapConstantFromName(QString mapName, bool includePrefix) {
@@ -463,7 +463,12 @@ QList<Event *> Map::getAllEvents() const {
return all_events;
}
QStringList Map::getScriptLabels(Event::Group group) const {
QStringList Map::getScriptLabels(Event::Group group) {
if (!this->scriptsLoaded) {
this->scriptsFileLabels = ParseUtil::getGlobalScriptLabels(this->getScriptsFilePath());
this->scriptsLoaded = true;
}
QStringList scriptLabels;
// Get script labels currently in-use by the map's events
@@ -482,7 +487,7 @@ QStringList Map::getScriptLabels(Event::Group group) const {
}
// Add scripts from map's scripts file, and empty names.
scriptLabels.append(scriptsFileLabels);
scriptLabels.append(this->scriptsFileLabels);
scriptLabels.sort(Qt::CaseInsensitive);
scriptLabels.prepend("0x0");
scriptLabels.prepend("NULL");