diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-06-28 19:37:45 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-06-28 19:37:45 +0000 |
| commit | 300e44b68e075d7fd78287e10262b0d502f4898d (patch) | |
| tree | 4c7d74eeb963f7f71c277d9fcc4275047a64a15c /pokemod/Trainer.cpp | |
| parent | d0a69fb182b3f11dd8073d1a3d33a61a75da66fc (diff) | |
| download | sigen-300e44b68e075d7fd78287e10262b0d502f4898d.tar.gz sigen-300e44b68e075d7fd78287e10262b0d502f4898d.tar.xz sigen-300e44b68e075d7fd78287e10262b0d502f4898d.zip | |
[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
Diffstat (limited to 'pokemod/Trainer.cpp')
| -rw-r--r-- | pokemod/Trainer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pokemod/Trainer.cpp b/pokemod/Trainer.cpp index b82dbd1c..3b32e1dd 100644 --- a/pokemod/Trainer.cpp +++ b/pokemod/Trainer.cpp @@ -47,7 +47,8 @@ Pokemod::Trainer::Trainer(const Trainer& trainer, const Pokemod* parent, const i Pokemod::Trainer::Trainer(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Trainer", parent, id) { - load(xml, id); + LOAD_ID(); + load(xml); } void Pokemod::Trainer::validate() @@ -60,9 +61,9 @@ void Pokemod::Trainer::validate() TEST_END(); } -void Pokemod::Trainer::load(const QDomElement& xml, int id) +void Pokemod::Trainer::load(const QDomElement& xml) { - LOAD_ID(); + LOAD_BEGIN(); LOAD(QString, name); LOAD(int, moneyFactor); LOAD(QPixmap, skin); |