[FIX] List members of pokemod classes now can be returned in their entirety

[FIX] Reworked pokescripting for ease of use
[FIX] Now (selected) pokemod values can be overridden in pokescripting

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@237 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 1 insertions, 28 deletions

diff --git a/pokescripting/MapWarpWrapper.h b/pokescripting/MapWarpWrapper.h
index 8bc3a7da..aefbd18b 100644
--- a/pokescripting/MapWarpWrapper.h
+++ b/pokescripting/MapWarpWrapper.h
@@ -22,7 +22,6 @@
 #include "ObjectWrapper.h"
 
 // Pokemod includes
-#include "../pokemod/Map.h"
 #include "../pokemod/MapWarp.h"
 
 namespace Pokescripting
@@ -43,39 +42,13 @@ class POKESCRIPTING_EXPORT MapWarpWrapper : public ObjectWrapper
         QPoint coordinate() const;
         int type() const;
         MapWarpWrapper* toWarp();
+        Pokemod::Script script() const;
     private:
         MapWarpWrapper(const Pokemod::MapWarp* warp, QObject* parent);
         MapWarpWrapper& operator=(const MapWarpWrapper& rhs);
         
         const Pokemod::MapWarp* m_warp;
 };
-
-inline MapWarpWrapper::MapWarpWrapper(const Pokemod::MapWarp* warp, QObject* parent) :
-        ObjectWrapper(warp, parent),
-        m_warp(warp)
-{
-}
-
-inline QString MapWarpWrapper::name() const
-{
-    return m_warp->name();
-}
-
-inline QPoint MapWarpWrapper::coordinate() const
-{
-    return m_warp->coordinate();
-}
-
-inline int MapWarpWrapper::type() const
-{
-    return m_warp->type();
-}
-
-inline MapWarpWrapper* MapWarpWrapper::toWarp()
-{
-    return new MapWarpWrapper(pokemod()->mapById(m_warp->toMap())->warpById(m_warp->toWarp()), this);
-}
-
 }
 
 #endif