Merge pull request #7 from hatkirby/es-rewrite

The ECS rewrite exceeds the original branch in functionality, so it is time to merge it in.

1 files changed, 13 insertions, 2 deletions

@@ -184,9 +184,15 @@ bool MapObject::operator!=(const MapObject& other) const
   return id != other.id;
 }
 
-MapObjectEntry::MapObjectEntry(const MapObject& object, int posx, int posy) : object(object)
+MapObjectEntry::MapObjectEntry(
+  const MapObject& object,
+  int posx,
+  int posy,
+  size_t index) :
+    object(object),
+    position(std::make_pair(posx, posy)),
+    index(index)
 {
-  position = std::make_pair(posx, posy);
 }
 
 const MapObject& MapObjectEntry::getObject() const
@@ -209,6 +215,11 @@ const std::map<std::string, MapObjectEntry::Item>& MapObjectEntry::getItems() co
   return items;
 }
 
+size_t MapObjectEntry::getIndex() const
+{
+  return index;
+}
+
 void MapObjectEntry::addItem(std::string id, Item& item)
 {
   items[id] = item;