diff options
Diffstat (limited to 'pokemod/MapTrainer.cpp')
| -rw-r--r-- | pokemod/MapTrainer.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp index b1db08d3..e64d6c16 100644 --- a/pokemod/MapTrainer.cpp +++ b/pokemod/MapTrainer.cpp @@ -16,9 +16,7 @@ */ // Qt includes -#include <QDir> #include <QMap> -#include <QStringList> // Pokemod includes #include "Pokemod.h" @@ -28,6 +26,12 @@ // Header include #include "MapTrainer.h" +MapTrainer::MapTrainer(const MapTrainer& trainer) : + Object("MapTrainer", trainer.pokemod(), trainer.id()) +{ + *this = trainer; +} + MapTrainer::MapTrainer(const Pokemod* pokemod, const int id) : Object("MapTrainer", pokemod, id), m_name(""), @@ -42,13 +46,13 @@ MapTrainer::MapTrainer(const Pokemod* pokemod, const int id) : { } -MapTrainer::MapTrainer(const Pokemod* pokemod, const MapTrainer& trainer, const int id) : +MapTrainer::MapTrainer(const MapTrainer& trainer, const Pokemod* pokemod, const int id) : Object("MapTrainer", pokemod, id) { *this = trainer; } -MapTrainer::MapTrainer(const Pokemod* pokemod, const QDomElement& xml, const int id) : +MapTrainer::MapTrainer(const QDomElement& xml, const Pokemod* pokemod, const int id) : Object("MapTrainer", pokemod, id) { load(xml, id); @@ -290,13 +294,13 @@ MapTrainerTeamMember* MapTrainer::newTeamMember() MapTrainerTeamMember* MapTrainer::newTeamMember(const QDomElement& xml) { - m_teamMember.append(new MapTrainerTeamMember(pokemod(), xml, newTeamMemberId())); + m_teamMember.append(new MapTrainerTeamMember(xml, pokemod(), newTeamMemberId())); return m_teamMember[teamMemberCount() - 1]; } MapTrainerTeamMember* MapTrainer::newTeamMember(const MapTrainerTeamMember& teamMember) { - m_teamMember.append(new MapTrainerTeamMember(pokemod(), teamMember, newTeamMemberId())); + m_teamMember.append(new MapTrainerTeamMember(teamMember, pokemod(), newTeamMemberId())); return m_teamMember[teamMemberCount() - 1]; } |