[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

1 files changed, 4 insertions, 4 deletions

diff --git a/sigscript/TileWrapper.cpp b/sigscript/TileWrapper.cpp
index 575fc0ac..3ef2525d 100644
--- a/sigscript/TileWrapper.cpp
+++ b/sigscript/TileWrapper.cpp
@@ -42,9 +42,9 @@ QString Sigscript::TileWrapper::name() const
 
 Sigscript::SpriteWrapper* Sigscript::TileWrapper::sprite()
 {
-    if (value("sprite").canConvert<QString>())
+    if (hasValueOfType<QString>("sprite"))
     {
-        SpriteWrapper* sprite = sigmod()->sprite(value("sprite").toString());
+        SpriteWrapper* sprite = sigmod()->sprite(valueOfType<QString>("sprite"));
         if (sprite && sprite->sprite().size() == QSize(64, 64))
             return sprite;
     }
@@ -53,8 +53,8 @@ Sigscript::SpriteWrapper* Sigscript::TileWrapper::sprite()
 
 bool Sigscript::TileWrapper::from(const Sigmod::Direction direction) const
 {
-    if (value(QString("direction-%1").arg(direction)).canConvert<bool>())
-        return value(QString("direction-%1").arg(direction)).toBool();
+    if (hasValueOfType<bool>(QString("direction-%1").arg(direction)))
+        return valueOfType<bool>(QString("direction-%1").arg(direction));
     return m_tile->from(direction);
 }