8 files changed, 70 insertions, 10 deletions

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<world nextmap="6" lastmap="0" startx="203" starty="44" startmap="0"><root>0</root><map id="0" expanded="true" title="Everything Is Embarrassing"><environment type="0">0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,20,0,0,0,0,0,0,0,18,9,8,10,8,11,8,10,10,8,11,8,9,10,21,0,
+<world nextmap="6" lastmap="1" startx="203" starty="44" startmap="0"><root>0</root><map id="0" expanded="true" title="Everything Is Embarrassing" nextObject="0"><environment type="0">0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,20,0,0,0,0,0,0,0,18,9,8,10,8,11,8,10,10,8,11,8,9,10,21,0,
 0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,8,8,17,0,0,0,0,0,0,0,0,0,0,0,0,0,22,21,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,8,8,8,8,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,
 0,19,0,0,0,0,0,0,0,0,0,0,0,18,8,8,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,
@@ -23,7 +23,7 @@
 0,0,0,0,24,3,1,2,1,1,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,27,1,3,2,26,0,0,0,0,0,0,
 1,2,3,1,25,0,0,0,0,0,20,0,0,0,0,0,0,19,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,27,1,2,2,4,3,1,
 0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,
-</environment><adjacent dir="left" type="warp" map="1"/><child>1</child><child>4</child><child>5</child></map><map id="1" expanded="false" title="It's A Trap!"><environment type="0">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+</environment><adjacent dir="left" type="warp" map="1"/><child>1</child><child>4</child><child>5</child></map><map id="1" expanded="false" title="It's A Trap!" nextObject="2"><environment type="0">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,
 0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,19,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -47,7 +47,7 @@
 0,0,0,27,2,2,3,3,3,4,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,20,0,0,0,0,0,19,0,0,27,1,1,1,2,2,2,26,0,0,0,0,0,0,0,0,0,0,24,4,2,2,1,3,2,2,1,2,2,3,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,19,0,0,0,0,0,
-</environment><entity type="checkpoint" x="262" y="156"/><adjacent dir="right" type="warp" map="0"/><adjacent dir="down" type="warp" map="4"/></map><map id="4" expanded="false" title="The Visitors"><environment type="0">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,
+</environment><entity type="checkpoint" x="262" y="156" index="0"/><entity type="checkpoint" x="76" y="141" index="1"/><adjacent dir="right" type="warp" map="0"/><adjacent dir="down" type="warp" map="4"/></map><map id="4" expanded="false" title="The Visitors" nextObject="0"><environment type="0">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,20,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,19,0,0,0,0,0,0,0,0,0,20,0,0,15,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,
@@ -71,7 +71,7 @@
 0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,15,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,
-</environment><adjacent dir="up" type="warp" map="1"/><adjacent dir="down" type="warp" map="5"/></map><map id="5" expanded="false" title="Now Is The Hour"><environment type="0">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,
+</environment><adjacent dir="up" type="warp" map="1"/><adjacent dir="down" type="warp" map="5"/></map><map id="5" expanded="false" title="Now Is The Hour" nextObject="1"><environment type="0">0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,13,0,0,0,20,0,0,0,0,0,0,0,
 0,0,0,19,0,0,0,0,0,0,0,0,19,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,19,0,0,0,0,0,
@@ -95,4 +95,4 @@
 2,2,2,2,2,2,26,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,12,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,27,1,3,4,2,1,3,2,1,1,2,4,1,1,1,3,1,1,4,2,1,3,4,1,25,19,0,0,0,0,0,0,0,0,
 0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-</environment><entity type="movplat" x="98" y="145"><item id="dir">1</item><item id="len">90</item><item id="speed">30</item></entity><adjacent dir="up" type="warp" map="4"/></map></world>
+</environment><entity type="movplat" x="98" y="145" index="0"><item id="dir">1</item><item id="len">90</item><item id="speed">30</item></entity><adjacent dir="up" type="warp" map="4"/></map></world>
@@ -54,6 +54,7 @@
                   <xs:attribute name="type" type="xs:string" use="required" />
                   <xs:attribute name="x" type="xs:integer" use="required" />
                   <xs:attribute name="y" type="xs:integer" use="required" />
+                  <xs:attribute name="index" type="xs:integer" use="required" />
                 </xs:complexType>
               </xs:element>
               
@@ -77,6 +78,7 @@
                 </xs:restriction>
               </xs:simpleType>
             </xs:attribute>
+            <xs:attribute name="nextObject" type="xs:integer" use="required" />
           </xs:complexType>
         </xs:element>
       </xs:sequence>
@@ -188,6 +188,11 @@ const Map::Adjacent& Map::getAdjacent(MoveDir direction) const
   }
 }
 
+size_t Map::getNextObjectIndex() const
+{
+  return nextObjectIndex;
+}
+
 void Map::setTitle(std::string title, bool dirty)
 {
   this->title = title;
@@ -271,3 +276,12 @@ void Map::setAdjacent(MoveDir direction, MoveType type, int map, bool dirty)
   }
 }
 
+size_t Map::getAndIncrementNextObjectIndex()
+{
+  return nextObjectIndex++;
+}
+
+void Map::setNextObjectIndex(size_t v)
+{
+  nextObjectIndex = v;
+}
@@ -89,6 +89,7 @@ class Map {
     bool getHidden() const;
     const std::map<MoveDir, Adjacent>& getAdjacents() const;
     const Adjacent& getAdjacent(MoveDir direction) const;
+    size_t getNextObjectIndex() const;
     
     void setTitle(std::string title, bool dirty = true);
     void setTileAt(int x, int y, int tile, bool dirty = true);
@@ -100,6 +101,8 @@ class Map {
     void setExpanded(bool exp);
     void setHidden(bool hid);
     void setAdjacent(MoveDir direction, MoveType type, int map = -1, bool dirty = true);
+    size_t getAndIncrementNextObjectIndex();
+    void setNextObjectIndex(size_t v);
     
   private:
     int id;
@@ -113,6 +116,7 @@ class Map {
     bool hidden = false;
     std::map<MoveDir, Adjacent> adjacents;
     const Adjacent defaultAdjacent {};
+    size_t nextObjectIndex = 0;
 };
 
 class MapPtrCtr : public wxTreeItemData {
@@ -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;
@@ -67,7 +67,11 @@ class MapObject {
 
 class MapObjectEntry {
   public:
-    MapObjectEntry(const MapObject& object, int posx, int posy);
+    MapObjectEntry(
+      const MapObject& object,
+      int posx,
+      int posy,
+      size_t index);
     
     struct Item {
       MapObject::Input::Type type;
@@ -78,6 +82,7 @@ class MapObjectEntry {
     std::pair<int, int> getPosition() const;
     Item& getItem(std::string str);
     const std::map<std::string, Item>& getItems() const;
+    size_t getIndex() const;
     
     void setPosition(int x, int y);
     void addItem(std::string id, Item& item);
@@ -89,6 +94,7 @@ class MapObjectEntry {
     const MapObject& object;
     std::pair<int, int> position;
     std::map<std::string, Item> items; 
+    size_t index;
 };
 
 class VariableChoiceValidator : public wxValidator {
@@ -256,7 +256,12 @@ void MapeditWidget::OnClick(wxMouseEvent& event)
       int x = (event.GetPosition().x + vX - EDITOR_SPACING_X*scale) / scale - (addingEntity->getWidth() / 2);
       int y = (event.GetPosition().y + vY - EDITOR_SPACING_Y*scale) / scale - (addingEntity->getHeight() / 2);
       
-      auto data = std::make_shared<MapObjectEntry>(*addingEntity, x, y);
+      auto data = std::make_shared<MapObjectEntry>(
+        *addingEntity,
+        x,
+        y,
+        map->getAndIncrementNextObjectIndex());
+        
       frame->commitAction(std::make_shared<Undoable>("Add " + addingEntity->getName(), [=] () {
         map->addObject(data);
         
@@ -94,6 +94,11 @@ World::World(std::string filename)
       map->setTitle((char*) titleKey, false);
       xmlFree(titleKey);
       
+      xmlChar* noiKey = xmlGetProp(node, (xmlChar*) "nextObject");
+      if (noiKey == 0) throw MapLoadException("map missing nextObject attribute");
+      map->setNextObjectIndex(atoi((char*) noiKey));
+      xmlFree(noiKey);
+      
       for (xmlNodePtr mapNode = node->xmlChildrenNode; mapNode != NULL; mapNode = mapNode->next)
       {
         if (!xmlStrcmp(mapNode->name, (const xmlChar*) "environment"))
@@ -125,7 +130,12 @@ World::World(std::string filename)
           int ypos = atoi((char*) yKey);
           xmlFree(yKey);
           
-          auto data = std::make_shared<MapObjectEntry>(obj, xpos, ypos);
+          xmlChar* indexKey = xmlGetProp(mapNode, (const xmlChar*) "index");
+          if (indexKey == 0) throw MapLoadException("entity missing index attribute");
+          int objIndex = atoi((char*) indexKey);
+          xmlFree(indexKey);
+          
+          auto data = std::make_shared<MapObjectEntry>(obj, xpos, ypos, objIndex);
           
           map->addObject(data, false);
           
@@ -312,6 +322,10 @@ void World::save(std::string name, wxTreeCtrl* mapTree)
     // title=
     rc = xmlTextWriterWriteAttribute(writer, (xmlChar*) "title", (xmlChar*) map.getTitle().c_str());
     if (rc < 0) throw MapWriteException(name);
+    
+    // nextObject=
+    rc = xmlTextWriterWriteFormatAttribute(writer, (xmlChar*) "nextObject", "%zu", map.getNextObjectIndex());
+    if (rc < 0) throw MapWriteException(name);
   
     //   <environment
     rc = xmlTextWriterStartElement(writer, (xmlChar*) "environment");
@@ -358,6 +372,10 @@ void World::save(std::string name, wxTreeCtrl* mapTree)
       rc = xmlTextWriterWriteFormatAttribute(writer, (xmlChar*) "y", "%d", object->getPosition().second);
       if (rc < 0) throw MapWriteException(name);
       
+      // index=
+      rc = xmlTextWriterWriteFormatAttribute(writer, (xmlChar*) "index", "%zu", object->getIndex());
+      if (rc < 0) throw MapWriteException(name);
+      
       for (auto item : object->getItems())
       {
         // <item