[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, 9 insertions, 3 deletions

diff --git a/pokemodr/StatusUI.cpp b/pokemodr/StatusUI.cpp
index 42618bb0..2f97daf4 100644
--- a/pokemodr/StatusUI.cpp
+++ b/pokemodr/StatusUI.cpp
@@ -35,7 +35,8 @@ Pokemodr::StatusUI::~StatusUI()
 void Pokemodr::StatusUI::setGui()
 {
     varName->setText(qobject_cast<Pokemod::Status*>(modified())->name());
-    varScript->setValue(qobject_cast<Pokemod::Status*>(modified())->script());
+    varBattleScript->setValue(qobject_cast<Pokemod::Status*>(modified())->battleScript());
+    varWorldScript->setValue(qobject_cast<Pokemod::Status*>(modified())->worldScript());
 }
 
 void Pokemodr::StatusUI::apply()
@@ -58,7 +59,12 @@ void Pokemodr::StatusUI::on_varName_textChanged(const QString& name)
     varName->setCursorPosition(cursor);
 }
 
-void Pokemodr::StatusUI::on_varScript_valueChanged(const Pokemod::Script& script)
+void Pokemodr::StatusUI::on_varBattleScript_valueChanged(const Pokemod::Script& battleScript)
 {
-    qobject_cast<Pokemod::Status*>(modified())->setScript(script);
+    qobject_cast<Pokemod::Status*>(modified())->setBattleScript(battleScript);
+}
+
+void Pokemodr::StatusUI::on_varWorldScript_valueChanged(const Pokemod::Script& worldScript)
+{
+    qobject_cast<Pokemod::Status*>(modified())->setWorldScript(worldScript);
 }