diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-09-07 18:49:29 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-09-07 18:49:29 +0000 |
| commit | f80268eb885e28c603cc88523cfce2751d1448e1 (patch) | |
| tree | d3e0a8b482f7d2a4bd177ecc300aa407177a42de /sigscript/AbilityWrapper.cpp | |
| parent | 48f9e57b1638ba047ca2dcd6d3251ee90bf9ef69 (diff) | |
| download | sigen-f80268eb885e28c603cc88523cfce2751d1448e1.tar.gz sigen-f80268eb885e28c603cc88523cfce2751d1448e1.tar.xz sigen-f80268eb885e28c603cc88523cfce2751d1448e1.zip | |
[FIX] Added a static poll method to Fraction
[FIX] More Arena stuff fleshed out
[FIX] Added priority scripts to Ability and Move
[FIX] A SigmodWrapper pointer is now passed around the containments
[FIX] Config now has templated methods for retrieving values
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@253 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigscript/AbilityWrapper.cpp')
| -rw-r--r-- | sigscript/AbilityWrapper.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sigscript/AbilityWrapper.cpp b/sigscript/AbilityWrapper.cpp index e5b22529..35e8dd82 100644 --- a/sigscript/AbilityWrapper.cpp +++ b/sigscript/AbilityWrapper.cpp @@ -41,8 +41,8 @@ QString Sigscript::AbilityWrapper::name() const int Sigscript::AbilityWrapper::priority() const { - if (value("priority").canConvert<int>()) - return value("priority").toInt(); + if (hasValueOfType<int>("priority")) + return valueOfType<int>("priority"); return m_ability->priority(); } @@ -60,3 +60,8 @@ Sigmod::Script Sigscript::AbilityWrapper::worldScript() const { return m_ability->worldScript(); } + +Sigmod::Script Sigscript::AbilityWrapper::priorityScript() const +{ + return m_ability->priorityScript(); +} |