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 --- pokescripting/StatusWrapper.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pokescripting/StatusWrapper.cpp') diff --git a/pokescripting/StatusWrapper.cpp b/pokescripting/StatusWrapper.cpp index 0b662efe..4c5191ad 100644 --- a/pokescripting/StatusWrapper.cpp +++ b/pokescripting/StatusWrapper.cpp @@ -39,7 +39,12 @@ QString Pokescripting::StatusWrapper::name() const return m_status->name(); } -Pokemod::Script Pokescripting::StatusWrapper::script() const +Pokemod::Script Pokescripting::StatusWrapper::battleScript() const { - return m_status->script(); + return m_status->battleScript(); +} + +Pokemod::Script Pokescripting::StatusWrapper::worldScript() const +{ + return m_status->worldScript(); } -- cgit