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.h | |
| 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.h')
| -rw-r--r-- | pokescripting/StatusWrapper.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pokescripting/StatusWrapper.h b/pokescripting/StatusWrapper.h index 2b6bafba..1a84e0a4 100644 --- a/pokescripting/StatusWrapper.h +++ b/pokescripting/StatusWrapper.h @@ -34,7 +34,8 @@ class POKESCRIPTING_EXPORT StatusWrapper : public ObjectWrapper static StatusWrapper* create(const Pokemod::Status* status, PokemodWrapper* parent); Q_SCRIPTABLE QString name() const; - Q_SCRIPTABLE Pokemod::Script script() const; + Q_SCRIPTABLE Pokemod::Script battleScript() const; + Q_SCRIPTABLE Pokemod::Script worldScript() const; private: StatusWrapper(const Pokemod::Status* status, PokemodWrapper* parent); StatusWrapper& operator=(const StatusWrapper& rhs); @@ -42,5 +43,6 @@ class POKESCRIPTING_EXPORT StatusWrapper : public ObjectWrapper const Pokemod::Status* m_status; }; } +Q_DECLARE_METATYPE(Pokescripting::StatusWrapper*) #endif |