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/Nature.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/Nature.cpp')
| -rw-r--r-- | pokemod/Nature.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pokemod/Nature.cpp b/pokemod/Nature.cpp index e3d61452..3ae75b96 100644 --- a/pokemod/Nature.cpp +++ b/pokemod/Nature.cpp @@ -47,7 +47,8 @@ Pokemod::Nature::Nature(const Nature& nature, const Pokemod* parent, const int i Pokemod::Nature::Nature(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Nature", parent, id) { - load(xml, id); + LOAD_ID(); + load(xml); } void Pokemod::Nature::validate() @@ -59,9 +60,9 @@ void Pokemod::Nature::validate() TEST_END(); } -void Pokemod::Nature::load(const QDomElement& xml, int id) +void Pokemod::Nature::load(const QDomElement& xml) { - LOAD_ID(); + LOAD_BEGIN(); LOAD(QString, name); LOAD_ARRAY(Fraction, stat, ST_End_GSC); LOAD(int, weight); |