1 files changed, 3 insertions, 50 deletions

diff --git a/pokemodr/MapWarpUI.cpp b/pokemodr/MapWarpUI.cpp
index 29774e13..f0f887a6 100644
--- a/pokemodr/MapWarpUI.cpp
+++ b/pokemodr/MapWarpUI.cpp
@@ -19,7 +19,6 @@
 #include "MapWarpUI.h"
 
 // Pokemod includes
-#include "../pokemod/Dialog.h"
 #include "../pokemod/Map.h"
 #include "../pokemod/MapWarp.h"
 #include "../pokemod/Pokemod.h"
@@ -38,7 +37,6 @@ MapWarpUI::~MapWarpUI()
 
 void MapWarpUI::initGui()
 {
-    varActivation->addItems(Pokemod::DirectionStr.mid(0, Pokemod::D_End));
     varType->addItems(MapWarp::TypeStr);
 }
 
@@ -51,12 +49,6 @@ void MapWarpUI::refreshGui()
         const Map* map = static_cast<const Pokemod*>(original()->pokemod())->map(i);
         varToMap->addItem(map->name(), map->id());
     }
-    varDialog->clear();
-    for (int i = 0; i < static_cast<const Pokemod*>(original()->pokemod())->dialogCount(); ++i)
-    {
-        const Dialog* dialog = static_cast<const Pokemod*>(original()->pokemod())->dialog(i);
-        varDialog->addItem(dialog->dialog().mid(0, 25), dialog->id());
-    }
 }
 
 void MapWarpUI::setGui()
@@ -64,13 +56,7 @@ void MapWarpUI::setGui()
     const bool resetWarps = (static_cast<MapWarp*>(modified())->toMap() != m_lastMap);
     varName->setText(static_cast<MapWarp*>(modified())->name());
     varCoordinate->setValue(static_cast<MapWarp*>(modified())->coordinate());
-    for (int i = 0; i < varActivation->count(); ++i)
-        varActivation->item(i)->setSelected(static_cast<MapWarp*>(modified())->from(i));
-    varDirectionOut->setCurrentIndex(static_cast<MapWarp*>(modified())->directionOut());
     varType->setCurrentIndex(static_cast<MapWarp*>(modified())->type());
-    varBiking->setCheckState((static_cast<MapWarp*>(modified())->isBiking() == Flag::On) ? Qt::Checked : ((static_cast<MapWarp*>(modified())->isBiking() == Flag::Off) ? Qt::Unchecked : Qt::PartiallyChecked));
-    varFlash->setCheckState((static_cast<MapWarp*>(modified())->isFlash() == Flag::On) ? Qt::Checked : ((static_cast<MapWarp*>(modified())->isFlash() == Flag::Off) ? Qt::Unchecked : Qt::PartiallyChecked));
-    varFog->setCheckState((static_cast<MapWarp*>(modified())->isFoggy() == Flag::On) ? Qt::Checked : ((static_cast<MapWarp*>(modified())->isFoggy() == Flag::Off) ? Qt::Unchecked : Qt::PartiallyChecked));
     varToMap->setCurrentIndex(varToMap->findData(static_cast<MapWarp*>(modified())->toMap()));
     m_lastMap = static_cast<MapWarp*>(modified())->toMap();
     if (resetWarps)
@@ -87,8 +73,7 @@ void MapWarpUI::setGui()
         }
     }
     varToWarp->setCurrentIndex(varToMap->findData(static_cast<MapWarp*>(modified())->toWarp()));
-    varWorkingFlag->setValue(static_cast<MapWarp*>(modified())->workingFlag());
-    varDialog->setCurrentIndex(varDialog->findData(static_cast<MapWarp*>(modified())->dialog()));
+    varScript->setValue(static_cast<MapWarp*>(modified())->script());
 }
 
 void MapWarpUI::apply()
@@ -114,37 +99,11 @@ void MapWarpUI::on_varCoordinate_valueChanged(const Point& coordinate)
     static_cast<MapWarp*>(modified())->setCoordinate(coordinate);
 }
 
-void MapWarpUI::on_varActivation_itemSelectionChanged()
-{
-    for (int i = 0; i < varActivation->count(); ++i)
-        static_cast<MapWarp*>(modified())->setFrom(i, varActivation->item(i)->isSelected());
-}
-
-void MapWarpUI::on_varDirectionOut_activated(const int directionOut)
-{
-    static_cast<MapWarp*>(modified())->setDirectionOut(directionOut);
-}
-
 void MapWarpUI::on_varType_activated(const int type)
 {
     static_cast<MapWarp*>(modified())->setType(type);
 }
 
-void MapWarpUI::on_varBiking_toggled(const int biking)
-{
-    static_cast<MapWarp*>(modified())->setIsBiking(biking);
-}
-
-void MapWarpUI::on_varFlash_toggled(const int flash)
-{
-    static_cast<MapWarp*>(modified())->setIsFlash(flash);
-}
-
-void MapWarpUI::on_varFog_toggled(const int fog)
-{
-    static_cast<MapWarp*>(modified())->setIsFoggy(fog);
-}
-
 void MapWarpUI::on_varToMap_activated(const int toMap)
 {
     static_cast<MapWarp*>(modified())->setToMap(toMap);
@@ -155,13 +114,7 @@ void MapWarpUI::on_varToWarp_activated(const int toWarp)
     static_cast<MapWarp*>(modified())->setToWarp(toWarp);
 }
 
-void MapWarpUI::on_varWorkingFlag_valueChanged(const Flag& workingFlag)
-{
-    static_cast<MapWarp*>(modified())->setWorkingFlag(workingFlag);
-}
-
-
-void MapWarpUI::on_varDialog_activated(const int dialog)
+void MapWarpUI::on_varScript_valueChanged(const Script& script)
 {
-    static_cast<MapWarp*>(modified())->setDialog(varDialog->itemData(dialog).toInt());
+    static_cast<MapWarp*>(modified())->setScript(script);
 }