summaryrefslogtreecommitdiffstats
path: root/pokemod/Author.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-06-28 19:37:45 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-06-28 19:37:45 +0000
commit300e44b68e075d7fd78287e10262b0d502f4898d (patch)
tree4c7d74eeb963f7f71c277d9fcc4275047a64a15c /pokemod/Author.cpp
parentd0a69fb182b3f11dd8073d1a3d33a61a75da66fc (diff)
downloadsigen-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/Author.cpp')
-rw-r--r--pokemod/Author.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/pokemod/Author.cpp b/pokemod/Author.cpp
index 44ce70b7..4f3bdf9d 100644
--- a/pokemod/Author.cpp
+++ b/pokemod/Author.cpp
@@ -48,7 +48,8 @@ Pokemod::Author::Author(const Author& author, const Pokemod* parent, const int i
Pokemod::Author::Author(const QDomElement& xml, const Pokemod* parent, const int id) :
Object("Author", parent, id)
{
- load(xml, id);
+ LOAD_ID();
+ load(xml);
}
void Pokemod::Author::validate()
@@ -65,9 +66,9 @@ void Pokemod::Author::validate()
TEST_END();
}
-void Pokemod::Author::load(const QDomElement& xml, int id)
+void Pokemod::Author::load(const QDomElement& xml)
{
- LOAD_ID();
+ LOAD_BEGIN();
LOAD(QString, name);
LOAD(QString, email);
LOAD(QString, role);