From 8bad37e82371bd41864903ac0d6f49808ad119bf Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 8 Nov 2008 06:15:08 +0000 Subject: [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 --- sigscript/TileWrapper.cpp | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'sigscript/TileWrapper.cpp') 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("sprite")) - { - SpriteWrapper* sprite = sigmod()->sprite(valueOfType("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(QString("direction-%1").arg(direction))) - return valueOfType(QString("direction-%1").arg(direction)); - return m_tile->from(direction); -} - Sigcore::Script Sigscript::TileWrapper::script() const { return m_tile->script(); -- cgit