1 files changed, 4 insertions, 22 deletions
diff --git a/pokemod/MapWarp.h b/pokemod/MapWarp.h
index 6395e3ef..2187fb0e 100644
--- a/pokemod/MapWarp.h
+++ b/pokemod/MapWarp.h
@@ -19,10 +19,10 @@
 #define __POKEMOD_MAPWARP__
 
 // Pokemod includes
-#include "Flag.h"
 #include "Object.h"
 #include "Point.h"
 #include "Pokemod.h"
+#include "Script.h"
 
 class MapWarp : public Object
 {
@@ -51,44 +51,26 @@ class MapWarp : public Object
         
         void setName(const QString& name);
         void setCoordinate(const Point& coordinate);
-        void setFrom(const int direction, const bool can);
-        void setDirectionOut(const int directionOut);
         void setType(const int type);
-        void setIsBiking(const int isBiking);
-        void setIsFlash(const int isFlash);
-        void setIsFoggy(const int isFoggy);
         void setToMap(const int toMap);
         void setToWarp(const int toWarp);
-        void setWorkingFlag(const Flag& workingFlag);
-        void setDialog(const int dialog);
+        void setScript(const Script& script);
         
         QString name() const;
         Point coordinate() const;
-        bool from(const int d) const;
-        int directionOut() const;
         int type() const;
-        int isBiking() const;
-        int isFlash() const;
-        int isFoggy() const;
         int toMap() const;
         int toWarp() const;
-        Flag workingFlag() const;
-        int dialog() const;
+        Script script() const;
         
         MapWarp& operator=(const MapWarp& rhs);
     private:
         QString m_name;
         Point m_coordinate;
-        bool m_from[Pokemod::D_End];
-        int m_directionOut;
         int m_type;
-        int m_isBiking;
-        int m_isFlash;
-        int m_isFoggy;
         int m_toMap;
         int m_toWarp;
-        Flag m_workingFlag;
-        int m_dialog;
+        Script m_script;
 };
 
 #endif