From b99070118a3cedc4fcc7514ba95fce2646d649c4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2008 23:40:50 +0000 Subject: [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 --- pokemodr/StatusUI.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'pokemodr/StatusUI.cpp') 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(modified())->name()); - varScript->setValue(qobject_cast(modified())->script()); + varBattleScript->setValue(qobject_cast(modified())->battleScript()); + varWorldScript->setValue(qobject_cast(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(modified())->setScript(script); + qobject_cast(modified())->setBattleScript(battleScript); +} + +void Pokemodr::StatusUI::on_varWorldScript_valueChanged(const Pokemod::Script& worldScript) +{ + qobject_cast(modified())->setWorldScript(worldScript); } -- cgit