From 213cab3c04b81428ab715f340bd7c12438fdb980 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sun, 15 Mar 2015 23:24:22 -0400
Subject: Map editor can now add entities to maps

Also fixed a big bug regarding scrolling
---
 tools/mapedit/src/map.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/tools/mapedit/src/map.h b/tools/mapedit/src/map.h
index 52e047d..850a66b 100644
--- a/tools/mapedit/src/map.h
+++ b/tools/mapedit/src/map.h
@@ -44,7 +44,7 @@ class MapWriteException: public std::exception
 };
 
 struct MapObjectEntry {
-  std::shared_ptr<MapObject> object;
+  MapObject* object;
   std::pair<double, double> position;
 };
 
@@ -64,7 +64,7 @@ class Map {
     bool hasUnsavedChanges() const;
     void setTileAt(int x, int y, int tile);
     int getTileAt(int x, int y) const;
-    std::list<MapObjectEntry> getObjects();
+    std::list<MapObjectEntry>& getObjects();
     
   private:
     std::list<MapObjectEntry> objects;
-- 
cgit 1.4.1