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

Remove old heal location map tracking, missing assignment in HealLocationEvent::duplicate

Browse Source
This commit is contained in:
GriffinR 2025-04-21 12:58:15 -04:00
parent c0df85e43b
commit 4b3c8abb93
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/events.cpp
View File

@ -775,6 +775,7 @@ Event *HealLocationEvent::duplicate() const {
copy->setX(this->getX());
copy->setY(this->getY());
copy->setIdName(this->getIdName());
copy->setHostMapName(this->getHostMapName());
copy->setRespawnMapName(this->getRespawnMapName());
copy->setRespawnNPC(this->getRespawnNPC());

16
src/project.cpp
View File

@ -848,15 +848,9 @@ void Project::saveHealLocations() {
// Build the JSON data for output.
QMap<QString, QList<OrderedJson::object>> idNameToJson;
for (auto i = this->healLocations.constBegin(); i != this->healLocations.constEnd(); i++) {
const QString mapConstant = i.key();
for (const auto &event : i.value()) {
// Heal location events don't need to track the "map" field, we're already tracking it either with
// the keys in the healLocations map or by virtue of the event being added to a particular Map object.
// The global JSON data needs this field, so we add it back here.
auto eventJson = event->buildEventJson(this);
eventJson["map"] = mapConstant;
idNameToJson[event->getIdName()].append(eventJson);
for (const auto &events : this->healLocations) {
for (const auto &event : events) {
idNameToJson[event->getIdName()].append(event->buildEventJson(this));
}
}
@ -871,8 +865,8 @@ void Project::saveHealLocations() {
}
}
// Save any heal locations that weren't covered above (should be any new data).
for (auto i = idNameToJson.constBegin(); i != idNameToJson.constEnd(); i++) {
for (const auto &object : i.value()) {
for (const auto &objects : idNameToJson) {
for (const auto &object : objects) {
eventJsonArr.push_back(object);
}
}