summaryrefslogtreecommitdiffstats
path: root/sigscript
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-11-09 18:53:21 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-11-09 18:53:21 +0000
commite965d4f6d7cd33c3901a61d9b798dcc5593534c7 (patch)
tree9d12f796894eabd820a8d2b68462b7123808293b /sigscript
parentc54d318ae9b4efa57938e29eac7f13ae75e799e5 (diff)
downloadsigen-e965d4f6d7cd33c3901a61d9b798dcc5593534c7.tar.gz
sigen-e965d4f6d7cd33c3901a61d9b798dcc5593534c7.tar.xz
sigen-e965d4f6d7cd33c3901a61d9b798dcc5593534c7.zip
[FIX] Starting the sigworld library
[FIX] Tile has walkable flag on it git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@310 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigscript')
-rw-r--r--sigscript/Config.cpp2
-rw-r--r--sigscript/TileWrapper.cpp7
-rw-r--r--sigscript/TileWrapper.h1
3 files changed, 9 insertions, 1 deletions
diff --git a/sigscript/Config.cpp b/sigscript/Config.cpp
index 3c88728b..54774720 100644
--- a/sigscript/Config.cpp
+++ b/sigscript/Config.cpp
@@ -28,8 +28,8 @@ void Sigscript::Config::addValue(const QString& name, const QVariant& value, con
{
if (!m_values.contains(name))
{
- setValue(name, value, options);
emit(valueAdded(name, value));
+ setValue(name, value, options);
}
}
diff --git a/sigscript/TileWrapper.cpp b/sigscript/TileWrapper.cpp
index 720824fa..2674caa8 100644
--- a/sigscript/TileWrapper.cpp
+++ b/sigscript/TileWrapper.cpp
@@ -40,6 +40,13 @@ QString Sigscript::TileWrapper::name() const
return m_tile->name();
}
+bool Sigscript::TileWrapper::walkable() const
+{
+ if (sigmod()->singlePlayer() && hasValueOfType<bool>("walkable"))
+ return valueOfType<bool>("walkable");
+ return m_tile->walkable();
+}
+
Sigcore::Script Sigscript::TileWrapper::script() const
{
return m_tile->script();
diff --git a/sigscript/TileWrapper.h b/sigscript/TileWrapper.h
index ef082ce8..a3b90cd6 100644
--- a/sigscript/TileWrapper.h
+++ b/sigscript/TileWrapper.h
@@ -34,6 +34,7 @@ class SIGSCRIPT_EXPORT TileWrapper : public ObjectWrapper
static TileWrapper* create(const Sigmod::Tile* tile, SigmodWrapper* parent);
Q_SCRIPTABLE QString name() const;
+ Q_SCRIPTABLE bool walkable() const;
Q_SCRIPTABLE Sigcore::Script script() const;
private:
TileWrapper(const Sigmod::Tile* tile, SigmodWrapper* parent);