[FIX] Script to make a tarball now defaults to HEAD for the revision

[FIX] Enumeration types used to help remove some checks
[FIX] Macro code moved to static members of Object (not all though)
[FIX] Scripting wrappers now share information by keeping track of already-created instances of the wrapper
[FIX] Scripting methods are now Q_SCRIPTABLE and not slots

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@239 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 13 insertions, 12 deletions

diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp
index 843e0880..67355553 100644
--- a/pokemod/Pokemod.cpp
+++ b/pokemod/Pokemod.cpp
@@ -274,11 +274,11 @@ void Pokemod::Pokemod::validate()
 void Pokemod::Pokemod::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
-    LOAD(QString, title);
-    LOAD(QString, version);
-    LOAD(QString, description);
-    LOAD(int, startMap);
-    LOAD(int, startWarp);
+    LOAD(title);
+    LOAD(version);
+    LOAD(description);
+    LOAD(startMap);
+    LOAD(startWarp);
     LOAD_Rules();
     LOAD_SUB(newAbility, Ability);
     LOAD_SUB(newAuthor, Author);
@@ -302,19 +302,20 @@ void Pokemod::Pokemod::load(const QDomElement& xml)
     LOAD_SUB(newTrainer, Trainer);
     LOAD_SUB(newType, Type);
     LOAD_SUB(newWeather, Weather);
-    LOAD_Typechart(setTypechart, Fraction, typechart);
+    LOAD_MATRIX(typechart);
+    m_typechart.resize(typeCount(), typeCount());
 }
 
 QDomElement Pokemod::Pokemod::save() const
 {
     QDomElement xml = QDomDocument().createElement(className());
-    SAVE(QString, title);
-    SAVE(QString, version);
-    SAVE(QString, description);
-    SAVE(int, startMap);
-    SAVE(int, startWarp);
+    SAVE(title);
+    SAVE(version);
+    SAVE(description);
+    SAVE(startMap);
+    SAVE(startWarp);
     SAVE_Rules(rules);
-    SAVE_MATRIX(Fraction, typechart);
+    SAVE_MATRIX(typechart);
     SAVE_SUB(Ability, abilities);
     SAVE_SUB(Author, authors);
     SAVE_SUB(Badge, badges);