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.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/tools/mapedit/src/map.cpp b/tools/mapedit/src/map.cpp
index b0440fb..1414e16 100644
--- a/tools/mapedit/src/map.cpp
+++ b/tools/mapedit/src/map.cpp
@@ -66,7 +66,7 @@ Map::Map(std::string filename)
             if (!xmlStrcmp(entityDataNode->name, (const xmlChar*) "entity-type"))
             {
               xmlChar* key = xmlNodeListGetString(doc, entityDataNode->xmlChildrenNode, 1);
-              data.object = MapObject::getAllObjects().at((char*) key);
+              data.object = MapObject::getAllObjects().at((char*) key).get();
               xmlFree(key);
             } else if (!xmlStrcmp(entityDataNode->name, (const xmlChar*) "entity-position"))
             {
@@ -226,7 +226,7 @@ void Map::setTitle(std::string title)
   this->title = title;
 }
 
-std::list<MapObjectEntry> Map::getObjects()
+std::list<MapObjectEntry>& Map::getObjects()
 {
   return objects;
 }
-- 
cgit 1.4.1