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

Merge branch 'master' of https://github.com/huderlem/porymap into slam

Browse Source
This commit is contained in:
garak
2024-02-22 16:20:23 -05:00
parent 05beed21ca 012f2a213a
commit 6520189352
50 changed files with 2647 additions and 1554 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;
}
void Map::setLayout(Layout *layout) {
@@ -117,7 +117,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
@@ -136,7 +141,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");