[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

1 files changed, 3 insertions, 79 deletions

diff --git a/sigmodr/MapUI.cpp b/sigmodr/MapUI.cpp
index a6b575e4..204f93a4 100644
--- a/sigmodr/MapUI.cpp
+++ b/sigmodr/MapUI.cpp
@@ -18,9 +18,6 @@
 // Header include
 #include "MapUI.h"
 
-// Sigmodr includes
-#include "TilemapModel.h"
-
 // Sigmod includes
 #include "../sigmod/Map.h"
 #include "../sigmod/MapWarp.h"
@@ -28,14 +25,13 @@
 #include "../sigmod/Sprite.h"
 #include "../sigmod/Tile.h"
 
-// Qt includes
-#include <QtGui/QHeaderView>
-
 Sigmodr::MapUI::MapUI(Sigmod::Map* map, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
     setObjects(map, new Sigmod::Map(*map));
+    varMap->setMap(map);
+    connect(varMap, SIGNAL(changed()), this, SIGNAL(changed()));
 }
 
 Sigmodr::MapUI::~MapUI()
@@ -47,11 +43,6 @@ void Sigmodr::MapUI::initGui()
     varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Outdoor], QVariant::fromValue(Sigmod::Map::Outdoor));
     varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Dungeon], QVariant::fromValue(Sigmod::Map::Dungeon));
     varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Building], QVariant::fromValue(Sigmod::Map::Building));
-    varTilemap->horizontalHeader()->setResizeMode(QHeaderView::Fixed);
-    varTilemap->verticalHeader()->setResizeMode(QHeaderView::Fixed);
-    varTilemap->horizontalHeader()->setDefaultSectionSize(64);
-    varTilemap->verticalHeader()->setDefaultSectionSize(64);
-    varTilemap->setModel(new TilemapModel(qobject_cast<Sigmod::Map*>(modified())->map(), sigmod()));
 }
 
 void Sigmodr::MapUI::refreshGui()
@@ -64,22 +55,6 @@ void Sigmodr::MapUI::refreshGui()
         varFlyWarp->addItem(warp->name(), warp->id());
     }
     varFlyWarp->blockSignals(blockedFlyWarp);
-    const bool blockedTile = varTile->blockSignals(true);
-    varTile->clear();
-    for (int i = 0; i < sigmod()->tileCount(); ++i)
-    {
-        const Sigmod::Tile* tile = sigmod()->tile(i);
-        if (sigmod()->spriteIndex(tile->sprite()) == INT_MAX)
-            varTile->addItem(tile->name(), tile->id());
-        else
-        {
-            QPixmap icon;
-            icon.loadFromData(sigmod()->spriteById(tile->sprite())->sprite());
-            varTile->addItem(icon, tile->name(), tile->id());
-        }
-    }
-    varTile->blockSignals(blockedTile);
-    varTile->setEnabled(false);
 }
 
 void Sigmodr::MapUI::setGui()
@@ -88,8 +63,7 @@ void Sigmodr::MapUI::setGui()
     boxFlyWarp->setChecked((qobject_cast<Sigmod::Map*>(modified())->flyWarp() == -1) ? Qt::Unchecked : Qt::Checked);
     varFlyWarp->setCurrentIndex(varFlyWarp->findData(qobject_cast<Sigmod::Map*>(modified())->flyWarp()));
     varType->setCurrentIndex(qobject_cast<Sigmod::Map*>(modified())->type());
-    buttonDeleteColumn->setEnabled(0 < varTilemap->model()->columnCount());
-    buttonDeleteRow->setEnabled(0 < varTilemap->model()->rowCount());
+    varMap->reset();
 }
 
 void Sigmodr::MapUI::apply()
@@ -126,53 +100,3 @@ void Sigmodr::MapUI::on_varType_activated(const int type)
 {
     qobject_cast<Sigmod::Map*>(modified())->setType(varType->itemData(type).value<Sigmod::Map::Type>());
 }
-
-void Sigmodr::MapUI::on_varTilemap_clicked(const QModelIndex& index)
-{
-    m_index = index;
-    varTile->setEnabled(true);
-    varTile->setCurrentIndex(varTile->findData(varTilemap->model()->data(m_index, Qt::EditRole)));
-}
-
-void Sigmodr::MapUI::on_buttonAddColumn_pressed()
-{
-    varTilemap->model()->insertColumns(varTilemap->model()->columnCount(), 1);
-    emit(changed(true));
-}
-
-void Sigmodr::MapUI::on_buttonAddRow_pressed()
-{
-    varTilemap->model()->insertRows(varTilemap->model()->rowCount(), 1);
-    emit(changed(true));
-}
-
-void Sigmodr::MapUI::on_buttonDeleteColumn_pressed()
-{
-    varTilemap->model()->removeColumns(m_index.column(), 1);
-    emit(changed(true));
-}
-
-void Sigmodr::MapUI::on_buttonDeleteRow_pressed()
-{
-    varTilemap->model()->removeRows(m_index.row(), 1);
-    emit(changed(true));
-}
-
-void Sigmodr::MapUI::on_buttonInsertColumn_pressed()
-{
-    varTilemap->model()->insertColumns(m_index.column(), 1);
-    emit(changed(true));
-}
-
-void Sigmodr::MapUI::on_buttonInsertRow_pressed()
-{
-    varTilemap->model()->insertRows(m_index.row(), 1);
-    emit(changed(true));
-}
-
-void Sigmodr::MapUI::on_varTile_activated(const int tile)
-{
-    varTilemap->model()->setData(m_index, varTile->itemData(tile), Qt::EditRole);
-    emit(changed(true));
-    setGui();
-}