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

Move heal location logic out of event class

Browse source
This commit is contained in:
Marcus Huderle 2018-09-24 19:21:10 -05:00
parent 0d33c3aa64
commit 083e8e6101
5 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/event.cpp
View file

@ -175,21 +175,6 @@ QString Event::buildWarpEventMacro(QMap<QString, QString> *mapNamesToMapConstant
return text; return text;
} }
HealLocation Event::buildHealLocation()
{
HealLocation hl;
hl.name = this->get("loc_name");
try {
hl.index = this->get("index").toInt();
}
catch(...) {
hl.index = 0;
}
hl.x = this->getU16("x");
hl.y = this->getU16("y");
return hl;
}
QString Event::buildCoordScriptEventMacro() QString Event::buildCoordScriptEventMacro()
{ {
QString text = ""; QString text = "";

2
core/event.h
View file

@ -1,7 +1,6 @@
#ifndef EVENT_H #ifndef EVENT_H
#define EVENT_H #define EVENT_H
#include "heallocation.h"
#include <QString> #include <QString>
#include <QPixmap> #include <QPixmap>
#include <QMap> #include <QMap>
@ -68,7 +67,6 @@ public:
QString buildObjectEventMacro(int); QString buildObjectEventMacro(int);
QString buildWarpEventMacro(QMap<QString, QString>*); QString buildWarpEventMacro(QMap<QString, QString>*);
HealLocation buildHealLocation();
QString buildCoordScriptEventMacro(); QString buildCoordScriptEventMacro();
QString buildCoordWeatherEventMacro(); QString buildCoordWeatherEventMacro();
QString buildSignEventMacro(); QString buildSignEventMacro();

15
core/heallocation.cpp
View file

@ -8,6 +8,21 @@ HealLocation::HealLocation(QString map, int i, uint16_t x, uint16_t y)
this->y = y; this->y = y;
} }
HealLocation HealLocation::fromEvent(Event *event)
{
HealLocation hl;
hl.name = event->get("loc_name");
try {
hl.index = event->get("index").toInt();
}
catch(...) {
hl.index = 0;
}
hl.x = event->getU16("x");
hl.y = event->getU16("y");
return hl;
}
QDebug operator<<(QDebug debug, const HealLocation &hl) QDebug operator<<(QDebug debug, const HealLocation &hl)
{ {
debug << "HealLocation_" + hl.name << "(" << hl.x << ',' << hl.y << ")"; debug << "HealLocation_" + hl.name << "(" << hl.x << ',' << hl.y << ")";

3
core/heallocation.h
View file

@ -1,6 +1,7 @@
#ifndef HEALLOCATION_H #ifndef HEALLOCATION_H
#define HEALLOCATION_H #define HEALLOCATION_H
#include "event.h"
#include <QString> #include <QString>
#include <QDebug> #include <QDebug>
@ -17,7 +18,7 @@ public:
int index; int index;
uint16_t x; uint16_t x;
uint16_t y; uint16_t y;
static HealLocation fromEvent(Event*);
}; };
#endif // HEALLOCATION_H #endif // HEALLOCATION_H

8
project.cpp
View file

@ -534,8 +534,8 @@ void Project::saveHealLocationStruct(Map *map) {
// set new location in flyableMapsList // set new location in flyableMapsList
if (map->events["heal_event_group"].length() > 0) { if (map->events["heal_event_group"].length() > 0) {
for (Event *heal : map->events["heal_event_group"]) { for (Event *healEvent : map->events["heal_event_group"]) {
HealLocation hl = heal->buildHealLocation(); HealLocation hl = HealLocation::fromEvent(healEvent);
flyableMaps[hl.index - 1] = hl; flyableMaps[hl.index - 1] = hl;
} }
} }
@ -1475,8 +1475,8 @@ void Project::saveMapEvents(Map *map) {
// save heal event changes // save heal event changes
if (map->events["heal_event_group"].length() > 0) { if (map->events["heal_event_group"].length() > 0) {
for (Event *heal : map->events["heal_event_group"]) { for (Event *healEvent : map->events["heal_event_group"]) {
HealLocation hl = heal->buildHealLocation(); HealLocation hl = HealLocation::fromEvent(healEvent);
flyableMaps[hl.index - 1] = hl; flyableMaps[hl.index - 1] = hl;
} }
} }