diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-11-08 06:15:08 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-11-08 06:15:08 +0000 |
| commit | 8bad37e82371bd41864903ac0d6f49808ad119bf (patch) | |
| tree | 77f0cb46059654cefb357d6eb4064c5740edf3d4 /sigscript/MapWarpWrapper.cpp | |
| parent | c127c0dae65a7600e0ab30b634f25d4915c61d16 (diff) | |
| download | sigen-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/MapWarpWrapper.cpp')
| -rw-r--r-- | sigscript/MapWarpWrapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sigscript/MapWarpWrapper.cpp b/sigscript/MapWarpWrapper.cpp index dfa581c6..4af106a9 100644 --- a/sigscript/MapWarpWrapper.cpp +++ b/sigscript/MapWarpWrapper.cpp @@ -54,11 +54,11 @@ QString Sigscript::MapWarpWrapper::name() const return m_warp->name(); } -QPoint Sigscript::MapWarpWrapper::coordinate() const +QRect Sigscript::MapWarpWrapper::area() const { - if (sigmod()->singlePlayer() && hasValueOfType<QPoint>("coordinate")) - return valueOfType<QPoint>("coordinate"); - return m_warp->coordinate(); + if (sigmod()->singlePlayer() && hasValueOfType<QRect>("area")) + return valueOfType<QRect>("area"); + return m_warp->area(); } Sigmod::MapWarp::Type Sigscript::MapWarpWrapper::type() const |