[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, 12 insertions, 10 deletions

diff --git a/sigmodr/CMakeLists.txt b/sigmodr/CMakeLists.txt
index 558c6916..626ad0ea 100644
--- a/sigmodr/CMakeLists.txt
+++ b/sigmodr/CMakeLists.txt
@@ -9,10 +9,6 @@ INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
 )
 
-SET(sigmodr_RESOURCES
-    overlays/overlays.qrc
-)
-QT4_ADD_RESOURCES(sigmodr_RESOURCE_SRCS ${sigmodr_RESOURCES})
 SET(sigmodr_FORMS
     gui/ability.ui
     gui/author.ui
@@ -33,7 +29,6 @@ SET(sigmodr_FORMS
     gui/mapwildlistencounter.ui
     gui/move.ui
     gui/nature.ui
-    gui/point.ui
     gui/rules.ui
     gui/script.ui
     gui/sigmod.ui
@@ -164,16 +159,20 @@ SET(sigmodr_MODEL_HEADERS
     models/WeatherModel.h
 )
 SET(sigmodr_MAIN_HEADERS
+    EffectItem.h
     FractionWidget.h
-    PointWidget.h
+    MapEditor.h
+    MapScene.h
     ScriptWidget.h
     SigmodTree.h
     SigmodTreeModel.h
     SigmodrPreferences.h
     SigmodrUI.h
-    TilemapModel.h
+    TileItem.h
+    TrainerItem.h
     TypechartModel.h
     ValidationDialog.h
+    WarpItem.h
 )
 SET(sigmodr_HEADERS
     ${sigmodr_WIDGET_HEADERS}
@@ -290,17 +289,21 @@ SET(sigmodr_MODEL_SRCS
     models/WeatherModel.cpp
 )
 SET(sigmodr_MAIN_SRCS
+    EffectItem.cpp
     FractionWidget.cpp
-    PointWidget.cpp
+    MapEditor.cpp
+    MapScene.cpp
     ScriptWidget.cpp
     SigmodTree.cpp
     SigmodTreeModel.cpp
     Sigmodr.cpp
     SigmodrPreferences.cpp
     SigmodrUI.cpp
-    TilemapModel.cpp
+    TileItem.cpp
+    TrainerItem.cpp
     TypechartModel.cpp
     ValidationDialog.cpp
+    WarpItem.cpp
 )
 SET(sigmodr_SRCS
     ${sigmodr_WIDGET_SRCS}
@@ -320,7 +323,6 @@ SET(sigmodr_DESKTOP_FILES
 KDE4_ADD_EXECUTABLE(sigmodr
     ${sigmodr_SRCS}
     ${sigmodr_UI_HEADERS}
-    ${sigmodr_RESOURCE_SRCS}
 )
 SET_TARGET_PROPERTIES(sigmodr
     PROPERTIES