From b191a68ca2b1ec370fc1faafb078e4e201b2b459 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Wed, 6 Feb 2008 05:02:11 +0000
Subject: [ADD] Tilemap editing to the Map form [ADD] MapUI.{h, cpp},
 TilemapModel.{h, cpp}, TileDelegate.{h, cpp} [FIX] Editing area of the main
 window now has scroll bars [FIX] CoinListUI is now safer with its combobox
 creation for the values [FIX] Minor fixes in Tile and Map classes [FIX]
 Matrix cleaned up

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@57 6ecfd1a5-f3ed-3746-8530-beee90d26b22
---
 pokemod/Map.cpp  | 10 ++++++++++
 pokemod/Map.h    |  2 ++
 pokemod/Tile.cpp |  1 -
 pokemod/Tile.h   |  2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'pokemod')

diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp
index 958f43f7..13b8ffd2 100644
--- a/pokemod/Map.cpp
+++ b/pokemod/Map.cpp
@@ -407,6 +407,16 @@ void Map::deleteRow(int y)
     tiles.deleteRow(y);
 }
 
+const Matrix<int>& Map::getMap() const
+{
+    return tiles;
+}
+
+Matrix<int>& Map::getMap()
+{
+    return tiles;
+}
+
 int Map::getTile(int x, int y) const
 {
     return tiles(x, y);
diff --git a/pokemod/Map.h b/pokemod/Map.h
index 03a3c4e3..716a44d2 100644
--- a/pokemod/Map.h
+++ b/pokemod/Map.h
@@ -71,6 +71,8 @@ class Map : public Object
         void deleteColumn(int x);
         void deleteRow(int y);
         
+        const Matrix<int>& getMap() const;
+        Matrix<int>& getMap();
         int getTile(int x, int y) const;
         int getWidth() const;
         int getHeight() const;
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp
index 428e9ad3..8c0535d1 100644
--- a/pokemod/Tile.cpp
+++ b/pokemod/Tile.cpp
@@ -20,7 +20,6 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
-#include "../general/Ref.h"
 #include "Pokemod.h"
 #include "Tile.h"
 
diff --git a/pokemod/Tile.h b/pokemod/Tile.h
index 4a2866b6..241f8d27 100644
--- a/pokemod/Tile.h
+++ b/pokemod/Tile.h
@@ -26,6 +26,8 @@
 #include <QString>
 #include <QStringList>
 #include "../general/Exception.h"
+#include "../general/Frac.h"
+#include "../general/Ref.h"
 #include "Object.h"
 
 class Pokemod;
-- 
cgit