Map editor can now edit properties for objects (breaks main game build)

1 files changed, 2 insertions, 16 deletions

@@ -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);