summaryrefslogtreecommitdiffstats
path: root/sigscript/TileWrapper.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-11-08 06:15:08 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-11-08 06:15:08 +0000
commit8bad37e82371bd41864903ac0d6f49808ad119bf (patch)
tree77f0cb46059654cefb357d6eb4064c5740edf3d4 /sigscript/TileWrapper.cpp
parentc127c0dae65a7600e0ab30b634f25d4915c61d16 (diff)
downloadsigen-8bad37e82371bd41864903ac0d6f49808ad119bf.tar.gz
sigen-8bad37e82371bd41864903ac0d6f49808ad119bf.tar.xz
sigen-8bad37e82371bd41864903ac0d6f49808ad119bf.zip
[FIX] No more asserts in sigmod
[FIX] Moved to using *ById instead of *Index methods in sigmod [FIX] Tilemaps are now collaged (not completely done on the editing side yet) [FIX] Removed the resource files (drawn natively instead) [FIX] ATBTimer now uses the built-in QTimer in a QObject [FIX] Coordinates are now edited on the map for warps, trainers, and effects [FIX] Tiles are now completely scripted [FIX] Config is now thread-safe git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@308 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigscript/TileWrapper.cpp')
-rw-r--r--sigscript/TileWrapper.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/sigscript/TileWrapper.cpp b/sigscript/TileWrapper.cpp
index 37c10601..720824fa 100644
--- a/sigscript/TileWrapper.cpp
+++ b/sigscript/TileWrapper.cpp
@@ -20,7 +20,6 @@
// Sigscript includes
#include "SigmodWrapper.h"
-#include "SpriteWrapper.h"
Sigscript::TileWrapper* Sigscript::TileWrapper::create(const Sigmod::Tile* tile, SigmodWrapper* parent)
{
@@ -41,24 +40,6 @@ QString Sigscript::TileWrapper::name() const
return m_tile->name();
}
-Sigscript::SpriteWrapper* Sigscript::TileWrapper::sprite()
-{
- if (sigmod()->singlePlayer() && hasValueOfType<QString>("sprite"))
- {
- SpriteWrapper* sprite = sigmod()->sprite(valueOfType<QString>("sprite"));
- if (sprite && sprite->sprite().size() == QSize(64, 64))
- return sprite;
- }
- return sigmod()->sprite(m_tile->sprite());
-}
-
-bool Sigscript::TileWrapper::from(const Sigmod::Direction direction) const
-{
- if (sigmod()->singlePlayer() && hasValueOfType<bool>(QString("direction-%1").arg(direction)))
- return valueOfType<bool>(QString("direction-%1").arg(direction));
- return m_tile->from(direction);
-}
-
Sigcore::Script Sigscript::TileWrapper::script() const
{
return m_tile->script();