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

Merge pull request #802 from TixoRebel/region_map_config
Some checks failed
Build Porymap / build-linux (, 5.14.2) (push) Has been cancelled
Details
Build Porymap / build-linux (, 6.8.*) (push) Has been cancelled
Details
Build Porymap / build-linux (minimal, 5.14.2) (push) Has been cancelled
Details
Build Porymap / build-macos (macos-15-intel) (push) Has been cancelled
Details
Build Porymap / build-macos (macos-latest) (push) Has been cancelled
Details
Build Porymap / build-static-windows (push) Has been cancelled
Details

Browse Source 
Add config option for region map sections json key
This commit is contained in:
GriffinR
2026-06-04 21:24:36 -04:00
committed by GitHub
parent 80b35d6ade 6abcf89138
commit eaf140da84
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/config/projectconfig.h
View File

@@ -66,6 +66,7 @@ enum ProjectIdentifier {
regex_incbin,
pals_output_extension,
tiles_output_extension,
key_region_map_sections,
};
enum ProjectFilePath {

2
src/config/projectconfig.cpp
View File

@@ -71,6 +71,8 @@ const QMap<ProjectIdentifier, QString> ProjectConfig::defaultIdentifiers = {
{ProjectIdentifier::regex_encounter_types, "\\bTILE_ENCOUNTER_"},
{ProjectIdentifier::regex_terrain_types, "\\bTILE_TERRAIN_"},
{ProjectIdentifier::regex_incbin, Regex::Pattern_INCBIN},
// JSON keys
{ProjectIdentifier::key_region_map_sections, "map_sections"},
// Other
{ProjectIdentifier::pals_output_extension, ".gbapal"},
{ProjectIdentifier::tiles_output_extension, ".4bpp.lz"},

8
src/project.cpp
View File

@@ -983,8 +983,10 @@ bool Project::saveRegionMapSections() {
mapSectionArray.append(mapSectionObj);
}
const QString mapSectionsKey = projectConfig.getIdentifier(ProjectIdentifier::key_region_map_sections);
OrderedJson::object object;
object["map_sections"] = mapSectionArray;
object[mapSectionsKey] = mapSectionArray;
OrderedJson::append(&object, this->customMapSectionsData);
ignoreWatchedFileTemporarily(filepath);
@@ -2549,8 +2551,10 @@ bool Project::readRegionMapSections() {
}
watchFile(filepath);
const QString mapSectionsKey = projectConfig.getIdentifier(ProjectIdentifier::key_region_map_sections);
QJsonObject mapSectionsGlobalObj = doc.object();
QJsonArray mapSections = mapSectionsGlobalObj.take("map_sections").toArray();
QJsonArray mapSections = mapSectionsGlobalObj.take(mapSectionsKey).toArray();
for (int i = 0; i < mapSections.size(); i++) {
QJsonObject mapSectionObj = mapSections.at(i).toObject();