diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-08-18 23:40:50 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-08-18 23:40:50 +0000 |
| commit | b99070118a3cedc4fcc7514ba95fce2646d649c4 (patch) | |
| tree | 186d30a5ace8bd07e252c67804622d3d38f96fb4 /pokescripting/StatusWrapper.cpp | |
| parent | 91a1658e4f949dc9c06f594956fa2c3d9b73b423 (diff) | |
| download | sigen-b99070118a3cedc4fcc7514ba95fce2646d649c4.tar.gz sigen-b99070118a3cedc4fcc7514ba95fce2646d649c4.tar.xz sigen-b99070118a3cedc4fcc7514ba95fce2646d649c4.zip | |
[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
Diffstat (limited to 'pokescripting/StatusWrapper.cpp')
| -rw-r--r-- | pokescripting/StatusWrapper.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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(); } |