From c1793a87ebea8c8e1bb2d5d1a409d105bfae3871 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2008 18:51:31 +0000 Subject: [FIX] Script to make a tarball now defaults to HEAD for the revision [FIX] Enumeration types used to help remove some checks [FIX] Macro code moved to static members of Object (not all though) [FIX] Scripting wrappers now share information by keeping track of already-created instances of the wrapper [FIX] Scripting methods are now Q_SCRIPTABLE and not slots git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@239 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokescripting/TileWrapper.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'pokescripting/TileWrapper.cpp') diff --git a/pokescripting/TileWrapper.cpp b/pokescripting/TileWrapper.cpp index a64f40c7..8cec95f5 100644 --- a/pokescripting/TileWrapper.cpp +++ b/pokescripting/TileWrapper.cpp @@ -19,9 +19,16 @@ #include "TileWrapper.h" // Pokescripting includes -#include "SpriteWrapper.h" +#include "PokemodWrapper.h" -Pokescripting::TileWrapper::TileWrapper(const Pokemod::Tile* tile, QObject* parent) : +Pokescripting::TileWrapper* Pokescripting::TileWrapper::create(const Pokemod::Tile* tile, PokemodWrapper* parent) +{ + if (!m_instances.contains(Signiture(parent, tile->id()))) + m_instances[Signiture(parent, tile->id())] = new TileWrapper(tile, parent); + return qobject_cast(m_instances[Signiture(parent, tile->id())]); +} + +Pokescripting::TileWrapper::TileWrapper(const Pokemod::Tile* tile, PokemodWrapper* parent) : ObjectWrapper(tile, parent), m_tile(tile) { @@ -38,13 +45,13 @@ Pokescripting::SpriteWrapper* Pokescripting::TileWrapper::sprite() { // TODO: Check sprite dimensions } - return SpriteWrapper::create(pokemod()->spriteById(m_tile->sprite()), this); + return pokemod()->sprite(m_tile->sprite()); } -bool Pokescripting::TileWrapper::from(const int direction) const +bool Pokescripting::TileWrapper::from(const Pokemod::Direction direction) const { - if (value(QString("direction-%1").arg(Pokemod::DirectionStr[direction])).canConvert()) - return value(QString("direction-%1").arg(Pokemod::DirectionStr[direction])).toBool(); + if (value(QString("direction-%1").arg(direction)).canConvert()) + return value(QString("direction-%1").arg(direction)).toBool(); return m_tile->from(direction); } -- cgit