CppJavaCoder
diff --git a/‎tmxlite/include/tmxlite/Tileset.hpp‎
Lines changed: 1 addition & 1 deletion b/‎tmxlite/include/tmxlite/Tileset.hpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tmxlite/src/Tileset.cpp‎
Lines changed: 10 additions & 1 deletion b/‎tmxlite/src/Tileset.cpp‎
Lines changed: 10 additions & 1 deletion
@@ -118,7 +118,7 @@ namespace tmx
         \brief Returns the last GID of this tile set.
         This is the ID of the last tile in the tile set.
         */
-        std::uint32_t getLastGID() const { return m_firstGID + getTileCount() - 1; }
+        std::uint32_t getLastGID() const;
         /*!
         \brief Returns the name of this tile set.
         */
 
@@ -165,6 +165,15 @@ void Tileset::parse(pugi::xml_node node)
             createMissingTile(ID);
         }
     }
+
+    //sort these just to make sure when we request last GID we get the corrtect value
+    std::sort(m_tiles.begin(), m_tiles.end(), [](const Tile& t1, const Tile& t2) {return t1.ID < t2.ID; });
+}
+
+std::uint32_t Tileset::getLastGID() const
+{
+    assert(!m_tiles.empty());
+    return m_firstGID + m_tiles.back().ID;
 }
 
 const Tileset::Tile* Tileset::getTile(std::uint32_t id) const
@@ -174,7 +183,7 @@ const Tileset::Tile* Tileset::getTile(std::uint32_t id) const
         return nullptr;
     }
 
-    //corrects the ID. Indiecies and ID`s are diffrent.
+    //corrects the ID. Indices and IDs are different.
     id = (getLastGID() - m_firstGID) - (getLastGID() - id);
 
     const auto itr = std::find_if(m_tiles.begin(), m_tiles.end(),
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,15 @@ void Tileset::parse(pugi::xml_node node)`
`165`	`165`	`createMissingTile(ID);`
`166`	`166`	`}`
`167`	`167`	`}`
	`168`	`+`
	`169`	`+ //sort these just to make sure when we request last GID we get the corrtect value`
	`170`	`+ std::sort(m_tiles.begin(), m_tiles.end(), [](const Tile& t1, const Tile& t2) {return t1.ID < t2.ID; });`
	`171`	`+}`
	`172`	`+`
	`173`	`+std::uint32_t Tileset::getLastGID() const`
	`174`	`+{`
	`175`	`+ assert(!m_tiles.empty());`
	`176`	`+ return m_firstGID + m_tiles.back().ID;`
`168`	`177`	`}`
`169`	`178`
`170`	`179`	`const Tileset::Tile* Tileset::getTile(std::uint32_t id) const`
`@@ -174,7 +183,7 @@ const Tileset::Tile* Tileset::getTile(std::uint32_t id) const`
`174`	`183`	`return nullptr;`
`175`	`184`	`}`
`176`	`185`
`177`		- //corrects the ID. Indiecies and ID`s are diffrent.
	`186`	`+ //corrects the ID. Indices and IDs are different.`
`178`	`187`	`id = (getLastGID() - m_firstGID) - (getLastGID() - id);`
`179`	`188`
`180`	`189`	`const auto itr = std::find_if(m_tiles.begin(), m_tiles.end(),`