diff options
Diffstat (limited to 'pokemod/MapWildList.cpp')
| -rw-r--r-- | pokemod/MapWildList.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp index 52a1dc78..07cd46ec 100644 --- a/pokemod/MapWildList.cpp +++ b/pokemod/MapWildList.cpp @@ -16,7 +16,6 @@ */ // Qt includes -#include <QDir> #include <QMap> // Pokemod includes @@ -30,6 +29,12 @@ const QStringList MapWildList::ControlStr = QStringList() << "Grass" << "Surfing" << "Fishing" << "Dive" << "Headbutt" << "Rock Smash"; +MapWildList::MapWildList(const MapWildList& wildList) : + Object("MapWildList", wildList.pokemod(), wildList.id()) +{ + *this = wildList; +} + MapWildList::MapWildList(const Pokemod* pokemod, const int id) : Object("MapWildList", pokemod, id), m_control(INT_MAX), @@ -38,13 +43,13 @@ MapWildList::MapWildList(const Pokemod* pokemod, const int id) : { } -MapWildList::MapWildList(const Pokemod* pokemod, const MapWildList& wildList, const int id) : +MapWildList::MapWildList(const MapWildList& wildList, const Pokemod* pokemod, const int id) : Object("MapWildList", pokemod, id) { *this = wildList; } -MapWildList::MapWildList(const Pokemod* pokemod, const QDomElement& xml, const int id) : +MapWildList::MapWildList(const QDomElement& xml, const Pokemod* pokemod, const int id) : Object("MapWildList", pokemod, id) { load(xml, id); @@ -280,13 +285,13 @@ MapWildListEncounter* MapWildList::newEncounter() MapWildListEncounter* MapWildList::newEncounter(const QDomElement& xml) { - m_encounters.append(new MapWildListEncounter(pokemod(), xml, newEncounterId())); + m_encounters.append(new MapWildListEncounter(xml, pokemod(), newEncounterId())); return m_encounters[encounterCount() - 1]; } MapWildListEncounter* MapWildList::newEncounter(const MapWildListEncounter& encounter) { - m_encounters.append(new MapWildListEncounter(pokemod(), encounter, newEncounterId())); + m_encounters.append(new MapWildListEncounter(encounter, pokemod(), newEncounterId())); return m_encounters[encounterCount() - 1]; } |