From 281bdf956a646fd8c9944e9a44f867c984792216 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 19 Mar 2015 11:42:54 -0400
Subject: Map editor can now edit properties for objects (breaks main game
 build)

---
 tools/mapedit/src/map.h | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'tools/mapedit/src/map.h')

diff --git a/tools/mapedit/src/map.h b/tools/mapedit/src/map.h
index c7f5b30..9c14218 100644
--- a/tools/mapedit/src/map.h
+++ b/tools/mapedit/src/map.h
@@ -8,10 +8,11 @@
 #include <memory>
 #include <wx/treectrl.h>
 #include <map>
+#include "object.h"
 
-class MapObject;
 class World;
 class MapeditFrame;
+class MapEntryObject;
 
 class MapLoadException: public std::exception
 {
@@ -41,21 +42,6 @@ class MapWriteException: public std::exception
     std::string mapname;
 };
 
-struct MapObjectEntry {
-  MapObject* object;
-  std::pair<int, int> position;
-  
-  bool operator==(MapObjectEntry& other) const
-  {
-    return (object == other.object) && (position == other.position);
-  }
-  
-  bool operator!=(MapObjectEntry& other) const
-  {
-    return (object != other.object) && (position != other.position);
-  }
-};
-
 class Map {
   public:
     Map(int id, World* world);
-- 
cgit 1.4.1