FlyWarp isn't needed on Map and cleaned up widget

2 files changed, 16 insertions, 71 deletions

diff --git a/sigmod/test/TestMap.cpp b/sigmod/test/TestMap.cpp
index d3e58d47..b96fd371 100644
--- a/sigmod/test/TestMap.cpp
+++ b/sigmod/test/TestMap.cpp
@@ -76,61 +76,40 @@ void TestMap::validation()
     QCOMPARE(m_warnings.size(), 8);
     QCOMPARE(m_errors.size(), 3);
     
-    m_map1->newWarp();
-    
-    m_map1->setFlyWarp(0);
-    m_map1->validate();
-    
-    QCOMPARE(m_warnings.size(), 12);
-    QCOMPARE(m_errors.size(), 3);
-    
-    m_map1->deleteWarp(0);
-    
-    m_map1->validate();
-    
-    QCOMPARE(m_warnings.size(), 16);
-    QCOMPARE(m_errors.size(), 5);
-    
-    m_map1->setFlyWarp(-1);
-    m_map1->validate();
-    
-    QCOMPARE(m_warnings.size(), 20);
-    QCOMPARE(m_errors.size(), 6);
-    
     m_map1->newEffect();
     
     m_map1->validate();
     
-    QCOMPARE(m_warnings.size(), 23);
-    QCOMPARE(m_errors.size(), 7);
+    QCOMPARE(m_warnings.size(), 11);
+    QCOMPARE(m_errors.size(), 4);
     
     m_map1->newTile();
     
     m_map1->validate();
     
-    QCOMPARE(m_warnings.size(), 25);
-    QCOMPARE(m_errors.size(), 8);
+    QCOMPARE(m_warnings.size(), 13);
+    QCOMPARE(m_errors.size(), 5);
     
     m_map1->newTrainer();
     
     m_map1->validate();
     
-    QCOMPARE(m_warnings.size(), 26);
-    QCOMPARE(m_errors.size(), 9);
+    QCOMPARE(m_warnings.size(), 14);
+    QCOMPARE(m_errors.size(), 6);
     
     m_map1->newWarp();
     
     m_map1->validate();
     
-    QCOMPARE(m_warnings.size(), 27);
-    QCOMPARE(m_errors.size(), 9);
+    QCOMPARE(m_warnings.size(), 15);
+    QCOMPARE(m_errors.size(), 6);
     
     m_map1->newWildList();
     
     m_map1->validate();
     
-    QCOMPARE(m_warnings.size(), 27);
-    QCOMPARE(m_errors.size(), 9);
+    QCOMPARE(m_warnings.size(), 15);
+    QCOMPARE(m_errors.size(), 6);
 }
 
 void TestMap::saving()
@@ -155,7 +134,6 @@ void TestMap::loading()
     m_map1->newWildList();
     
     m_map1->setName("Bar");
-    m_map1->setFlyWarp(1);
     m_map1->setType(Sigmod::Map::Dungeon);
     m_map1->setWidth(5);
     m_map1->setHeight(5);
@@ -165,7 +143,6 @@ void TestMap::loading()
     m_map1->load(xml.firstChildElement("Map"));
     
     QCOMPARE(m_map1->name(), QString("Foo"));
-    QCOMPARE(m_map1->flyWarp(), -1);
     QCOMPARE(m_map1->type(), Sigmod::Map::Outdoor);
     QCOMPARE(m_map1->width(), 1);
     QCOMPARE(m_map1->height(), 1);
@@ -189,36 +166,6 @@ void TestMap::setName()
     QCOMPARE(m_errors.size(), 0);
 }
 
-void TestMap::setFlyWarp()
-{
-    m_map2->setFlyWarp(0);
-    
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 1);
-    
-    m_map2->newWarp();
-    
-    m_map2->setFlyWarp(0);
-    m_map2->setFlyWarp(0);
-    
-    QCOMPARE(m_map2->flyWarp(), 0);
-    
-    QCOMPARE(m_changedCount, 1);
-    
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 1);
-    
-    m_map2->setFlyWarp(-1);
-    m_map2->setFlyWarp(-1);
-    
-    QCOMPARE(m_map2->flyWarp(), -1);
-    
-    QCOMPARE(m_changedCount, 2);
-    
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 1);
-}
-
 void TestMap::setType()
 {
     m_map2->setType(Sigmod::Map::Dungeon);
@@ -342,23 +289,23 @@ void TestMap::trainers()
 
 void TestMap::warps()
 {
+    QCOMPARE(m_map2->newWarp()->id(), 0);
     QCOMPARE(m_map2->newWarp()->id(), 1);
     QCOMPARE(m_map2->newWarp()->id(), 2);
-    QCOMPARE(m_map2->newWarp()->id(), 3);
     
-    QCOMPARE(m_map2->warpCount(), 4);
+    QCOMPARE(m_map2->warpCount(), 3);
     
     m_map2->deleteWarp(0);
     
-    QCOMPARE(m_map2->warpCount(), 3);
+    QCOMPARE(m_map2->warpCount(), 2);
     
     QCOMPARE(m_map2->newWarp()->id(), 0);
     
-    QCOMPARE(m_map2->warpIndex(0), 3);
+    QCOMPARE(m_map2->warpIndex(0), 2);
     
     m_map2->deleteWarpById(1);
     
-    QCOMPARE(m_map2->warpIndex(0), 2);
+    QCOMPARE(m_map2->warpIndex(0), 1);
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 0);
@@ -393,14 +340,13 @@ void TestMap::assignment()
     *m_map3 = *m_map2;
     
     QCOMPARE(m_map3->name(), QString("Foo"));
-    QCOMPARE(m_map3->flyWarp(), -1);
     QCOMPARE(m_map3->type(), Sigmod::Map::Dungeon);
     QCOMPARE(m_map3->width(), 5);
     QCOMPARE(m_map3->height(), 5);
     QCOMPARE(m_map3->effectCount(), 2);
     QCOMPARE(m_map3->tileCount(), 2);
     QCOMPARE(m_map3->trainerCount(), 2);
-    QCOMPARE(m_map3->warpCount(), 3);
+    QCOMPARE(m_map3->warpCount(), 2);
     QCOMPARE(m_map3->wildListCount(), 2);
 }
 
diff --git a/sigmod/test/TestMap.h b/sigmod/test/TestMap.h
index 6cf4a8a1..af49a997 100644
--- a/sigmod/test/TestMap.h
+++ b/sigmod/test/TestMap.h
@@ -43,7 +43,6 @@ class TestMap : public TestSigmodObject
         void loading();
         
         void setName();
-        void setFlyWarp();
         void setType();
         void setWidth();
         void setHeight();