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

Fix null characters being written to JSON files

Browse source
This commit is contained in:
GriffinR 2023-02-12 13:30:33 -05:00
parent fcc140777d
commit a3a2f3bbcd
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -11,6 +11,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
- Change encounter tab copy and paste behavior. - Change encounter tab copy and paste behavior.
### Fixed ### Fixed
- Fix null characters being unpredictably written to some JSON files.
- Fix tilesets that share part of their name loading incorrectly. - Fix tilesets that share part of their name loading incorrectly.
- Fix events being hidden behind connecting maps. - Fix events being hidden behind connecting maps.
- Fix some minor visual issues on the Connections tab. - Fix some minor visual issues on the Connections tab.

18
src/core/events.cpp
View file

@ -151,8 +151,6 @@ EventFrame *ObjectEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new ObjectFrame(this); this->eventFrame = new ObjectFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }
@ -307,8 +305,6 @@ EventFrame *CloneObjectEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new CloneObjectFrame(this); this->eventFrame = new CloneObjectFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }
@ -417,8 +413,6 @@ EventFrame *WarpEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new WarpFrame(this); this->eventFrame = new WarpFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }
@ -509,8 +503,6 @@ EventFrame *TriggerEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new TriggerFrame(this); this->eventFrame = new TriggerFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }
@ -585,8 +577,6 @@ EventFrame *WeatherTriggerEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new WeatherTriggerFrame(this); this->eventFrame = new WeatherTriggerFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }
@ -660,8 +650,6 @@ EventFrame *SignEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new SignFrame(this); this->eventFrame = new SignFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }
@ -735,8 +723,6 @@ EventFrame *HiddenItemEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new HiddenItemFrame(this); this->eventFrame = new HiddenItemFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }
@ -830,8 +816,6 @@ EventFrame *SecretBaseEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new SecretBaseFrame(this); this->eventFrame = new SecretBaseFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }
@ -885,8 +869,6 @@ EventFrame *HealLocationEvent::createEventFrame() {
if (!this->eventFrame) { if (!this->eventFrame) {
this->eventFrame = new HealLocationFrame(this); this->eventFrame = new HealLocationFrame(this);
this->eventFrame->setup(); this->eventFrame->setup();
QObject::connect(this->eventFrame, &QObject::destroyed, [this](){ this->eventFrame = nullptr; });
} }
return this->eventFrame; return this->eventFrame;
} }