[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

1 files changed, 5 insertions, 1 deletions

diff --git a/sigscript/MapWrapper.h b/sigscript/MapWrapper.h
index 029109cc..b6cdaae5 100644
--- a/sigscript/MapWrapper.h
+++ b/sigscript/MapWrapper.h
@@ -28,6 +28,7 @@ namespace Sigscript
 {
 // Forward declarations
 class MapEffectWrapper;
+class MapTileWrapper;
 class MapTrainerWrapper;
 class MapWarpWrapper;
 class MapWildListWrapper;
@@ -41,6 +42,7 @@ class SIGSCRIPT_EXPORT MapWrapper : public ObjectWrapper
         static MapWrapper* create(const Sigmod::Map* map, SigmodWrapper* parent);
         
         MapEffectWrapper* effect(const int id);
+        MapTileWrapper* tile(const int id);
         MapTrainerWrapper* trainer(const int id);
         MapWarpWrapper* warp(const int id);
         MapWildListWrapper* wildList(const int id);
@@ -50,9 +52,11 @@ class SIGSCRIPT_EXPORT MapWrapper : public ObjectWrapper
         Q_SCRIPTABLE QString name() const;
         Q_SCRIPTABLE MapWarpWrapper* flyWarp();
         Q_SCRIPTABLE Sigmod::Map::Type type() const;
-        Q_SCRIPTABLE TileWrapper* tile(const int row, const int column);
+        Q_SCRIPTABLE int width() const;
+        Q_SCRIPTABLE int height() const;
         
         Q_SCRIPTABLE MapEffectWrapper* effect(const QString& name);
+        Q_SCRIPTABLE QList<MapTileWrapper*> tiles();
         Q_SCRIPTABLE MapTrainerWrapper* trainer(const QString& name);
         Q_SCRIPTABLE MapWarpWrapper* warp(const QString& name);
         Q_SCRIPTABLE MapWildListWrapper* wildList(const QString& name);