[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

1 files changed, 4 insertions, 3 deletions

diff --git a/pokemod/Sprite.cpp b/pokemod/Sprite.cpp
index e497f270..4b2802bb 100644
--- a/pokemod/Sprite.cpp
+++ b/pokemod/Sprite.cpp
@@ -44,7 +44,8 @@ Pokemod::Sprite::Sprite(const Sprite& sprite, const Pokemod* parent, const int i
 Pokemod::Sprite::Sprite(const QDomElement& xml, const Pokemod* parent, const int id) :
         Object("Sprite", parent, id)
 {
-    load(xml, id);
+    LOAD_ID();
+    load(xml);
 }
 
 Pokemod::Sprite::~Sprite()
@@ -59,9 +60,9 @@ void Pokemod::Sprite::validate()
     TEST_END();
 }
 
-void Pokemod::Sprite::load(const QDomElement& xml, int id)
+void Pokemod::Sprite::load(const QDomElement& xml)
 {
-    LOAD_ID();
+    LOAD_BEGIN();
     LOAD(QString, name);
     LOAD(QPixmap, sprite);
 }