From 300e44b68e075d7fd78287e10262b0d502f4898d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 28 Jun 2008 19:37:45 +0000 Subject: [FIX] Macros fixed and ID can't be set outside of constructors [FIX] Map flyWarp no longer raises and error by default git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@216 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemod/MapTrainerTeamMember.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pokemod/MapTrainerTeamMember.cpp') diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp index ad1945cb..1d81732e 100644 --- a/pokemod/MapTrainerTeamMember.cpp +++ b/pokemod/MapTrainerTeamMember.cpp @@ -52,7 +52,8 @@ Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) : Object("MapTrainerTeamMember", parent, id) { - load(xml, id); + LOAD_ID(); + load(xml); } void Pokemod::MapTrainerTeamMember::validate() @@ -75,9 +76,9 @@ void Pokemod::MapTrainerTeamMember::validate() TEST_END(); } -void Pokemod::MapTrainerTeamMember::load(const QDomElement& xml, int id) +void Pokemod::MapTrainerTeamMember::load(const QDomElement& xml) { - LOAD_ID(); + LOAD_BEGIN(); LOAD(int, species); LOAD(int, level); LOAD_LIST(int, ability); -- cgit