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/MapTrainer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pokemod/MapTrainer.cpp') diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp index 8aef8595..31507ec5 100644 --- a/pokemod/MapTrainer.cpp +++ b/pokemod/MapTrainer.cpp @@ -54,7 +54,8 @@ Pokemod::MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, co Pokemod::MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) : Object("MapTrainer", parent, id) { - load(xml, id); + LOAD_ID(); + load(xml); } Pokemod::MapTrainer::~MapTrainer() @@ -80,9 +81,9 @@ void Pokemod::MapTrainer::validate() TEST_END(); } -void Pokemod::MapTrainer::load(const QDomElement& xml, int id) +void Pokemod::MapTrainer::load(const QDomElement& xml) { - LOAD_ID(); + LOAD_BEGIN(); LOAD(QString, name); LOAD(int, trainerClass); LOAD(Point, coordinate); -- cgit