[FIX] TeamMember now allows shadowing of values

[FIX] TeamMember no longer uses pokemod internally (all is accessed through wrappers)
[FIX] Status now has the script split between Battle and World
[FIX] Script classes now able to be passed via QVariant

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

1 files changed, 22 insertions, 8 deletions

diff --git a/pokemod/Status.cpp b/pokemod/Status.cpp
index 41fbf680..04702d48 100644
--- a/pokemod/Status.cpp
+++ b/pokemod/Status.cpp
@@ -32,7 +32,8 @@ Pokemod::Status::Status(const Status& status) :
 Pokemod::Status::Status(const Pokemod* parent, const int id) :
         Object(parent, id),
         m_name(""),
-        m_script("", "")
+        m_battleScript("", ""),
+        m_worldScript("", "")
 {
 }
 
@@ -65,14 +66,16 @@ void Pokemod::Status::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(name);
-    LOAD(script);
+    LOAD(battleScript);
+    LOAD(worldScript);
 }
 
 QDomElement Pokemod::Status::save() const
 {
     SAVE_CREATE();
     SAVE(name);
-    SAVE(script);
+    SAVE(battleScript);
+    SAVE(worldScript);
     return xml;
 }
 
@@ -81,9 +84,14 @@ void Pokemod::Status::setName(const QString& name)
     CHECK(name);
 }
 
-void Pokemod::Status::setScript(const Script& script)
+void Pokemod::Status::setBattleScript(const Script& battleScript)
 {
-    CHECK(script);
+    CHECK(battleScript);
+}
+
+void Pokemod::Status::setWorldScript(const Script& worldScript)
+{
+    CHECK(worldScript);
 }
 
 QString Pokemod::Status::name() const
@@ -91,9 +99,14 @@ QString Pokemod::Status::name() const
     return m_name;
 }
 
-Pokemod::Script Pokemod::Status::script() const
+Pokemod::Script Pokemod::Status::battleScript() const
+{
+    return m_battleScript;
+}
+
+Pokemod::Script Pokemod::Status::worldScript() const
 {
-    return m_script;
+    return m_worldScript;
 }
 
 Pokemod::Status& Pokemod::Status::operator=(const Status& rhs)
@@ -101,6 +114,7 @@ Pokemod::Status& Pokemod::Status::operator=(const Status& rhs)
     if (this == &rhs)
         return *this;
     COPY(name);
-    COPY(script);
+    COPY(battleScript);
+    COPY(worldScript);
     return *this;
 }