From f80268eb885e28c603cc88523cfce2751d1448e1 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 7 Sep 2008 18:49:29 +0000 Subject: [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 --- sigscript/AbilityWrapper.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sigscript/AbilityWrapper.cpp') 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()) - return value("priority").toInt(); + if (hasValueOfType("priority")) + return valueOfType("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(); +} -- cgit