Switched all gid variables from int to unsigned.

Source/Urho3D/AngelScript/Urho2DAPI.cpp

@@ -264,7 +264,7 @@ static void RegisterTileMapDefs2D(asIScriptEngine* engine)
     engine->RegisterGlobalProperty("const uint FLIP_ALL", (void*)&FLIP_ALL);
 
     RegisterRefCounted<Tile2D>(engine, "Tile2D");
-    engine->RegisterObjectMethod("Tile2D", "int get_gid() const", asMETHOD(Tile2D, GetGid), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Tile2D", "uint get_gid() const", asMETHOD(Tile2D, GetGid), asCALL_THISCALL);
     engine->RegisterObjectMethod("Tile2D", "bool get_flipX() const", asMETHOD(Tile2D, GetFlipX), asCALL_THISCALL);
     engine->RegisterObjectMethod("Tile2D", "bool get_flipY() const", asMETHOD(Tile2D, GetFlipY), asCALL_THISCALL);
     engine->RegisterObjectMethod("Tile2D", "bool get_swapXY() const", asMETHOD(Tile2D, GetSwapXY), asCALL_THISCALL);
@@ -280,7 +280,7 @@ static void RegisterTileMapDefs2D(asIScriptEngine* engine)
     engine->RegisterObjectMethod("TileMapObject2D", "const Vector2& get_size() const", asMETHOD(TileMapObject2D, GetSize), asCALL_THISCALL);
     engine->RegisterObjectMethod("TileMapObject2D", "uint get_numPoints() const", asMETHOD(TileMapObject2D, GetNumPoints), asCALL_THISCALL);
     engine->RegisterObjectMethod("TileMapObject2D", "const Vector2& GetPoint(uint) const", asMETHOD(TileMapObject2D, GetPoint), asCALL_THISCALL);
-    engine->RegisterObjectMethod("TileMapObject2D", "int get_tileGid() const", asMETHOD(TileMapObject2D, GetTileGid), asCALL_THISCALL);
+    engine->RegisterObjectMethod("TileMapObject2D", "uint get_tileGid() const", asMETHOD(TileMapObject2D, GetTileGid), asCALL_THISCALL);
     engine->RegisterObjectMethod("TileMapObject2D", "bool get_tileFlipX() const", asMETHOD(TileMapObject2D, GetTileFlipX), asCALL_THISCALL);
     engine->RegisterObjectMethod("TileMapObject2D", "bool get_tileFlipY() const", asMETHOD(TileMapObject2D, GetTileFlipY), asCALL_THISCALL);
     engine->RegisterObjectMethod("TileMapObject2D", "bool get_tileSwapXY() const", asMETHOD(TileMapObject2D, GetTileSwapXY), asCALL_THISCALL);
@@ -323,7 +323,7 @@ static void RegisterTileMapLayer2D(asIScriptEngine* engine)
     engine->RegisterObjectMethod("TileMapLayer2D", "Node@+ get_imageNode() const", asMETHOD(TileMapLayer2D, GetImageNode), asCALL_THISCALL);
 }
 
-static CScriptArray* TileMap2DGetTileCollisionShapes(int gid, TileMap2D* tileMap)
+static CScriptArray* TileMap2DGetTileCollisionShapes(unsigned gid, TileMap2D* tileMap)
 {
     Vector<SharedPtr<TileMapObject2D> > result = tileMap->GetTileCollisionShapes(gid);
     return VectorToArray<SharedPtr<TileMapObject2D> >(result, "Array<TileMapObject2D@>@");
@@ -338,7 +338,7 @@ static void RegisterTileMap2D(asIScriptEngine* engine)
     engine->RegisterObjectMethod("TileMap2D", "TileMapLayer2D@+ GetLayer(uint) const", asMETHOD(TileMap2D, GetLayer), asCALL_THISCALL);
     engine->RegisterObjectMethod("TileMap2D", "Vector2 TileIndexToPosition(int, int) const", asMETHOD(TileMap2D, TileIndexToPosition), asCALL_THISCALL);
     engine->RegisterObjectMethod("TileMap2D", "bool PositionToTileIndex(int&out x, int &out y, const Vector2&in) const", asMETHOD(TileMap2D, PositionToTileIndex), asCALL_THISCALL);
-    engine->RegisterObjectMethod("TileMap2D", "Array<TileMapObject2D@>@ GetTileCollisionShapes(int) const", asFUNCTION(TileMap2DGetTileCollisionShapes), asCALL_CDECL_OBJLAST);
+    engine->RegisterObjectMethod("TileMap2D", "Array<TileMapObject2D@>@ GetTileCollisionShapes(uint) const", asFUNCTION(TileMap2DGetTileCollisionShapes), asCALL_CDECL_OBJLAST);
 }
 
 static void RegisterRigidBody2D(asIScriptEngine* engine)

Source/Urho3D/LuaScript/pkgs/Urho2D/TileMapDefs2D.pkg

@@ -55,7 +55,7 @@ static const unsigned FLIP_ALL;
 
 class Tile2D
 {
-    int GetGid() const;
+    unsigned GetGid() const;
     bool GetFlipX() const;
     bool GetFlipY() const;
     bool GetSwapXY() const;
@@ -63,7 +63,7 @@ class Tile2D
     bool HasProperty(const String name) const;
     const String GetProperty(const String name) const;
 
-    tolua_readonly tolua_property__get_set int gid;
+    tolua_readonly tolua_property__get_set unsigned gid;
     tolua_readonly tolua_property__get_set Sprite2D* sprite;
 };
 
@@ -76,7 +76,7 @@ class TileMapObject2D
     const Vector2& GetSize() const;
     unsigned GetNumPoints() const;
     const Vector2& GetPoint(unsigned index) const;
-    int GetTileGid() const;
+    unsigned GetTileGid() const;
     bool GetTileFlipX() const;
     bool GetTileFlipY() const;
     bool GetTileSwapXY() const;
@@ -90,6 +90,6 @@ class TileMapObject2D
     tolua_readonly tolua_property__get_set Vector2 position;
     tolua_readonly tolua_property__get_set Vector2 size;
     tolua_readonly tolua_property__get_set unsigned numPoints;
-    tolua_readonly tolua_property__get_set int tileGid;
+    tolua_readonly tolua_property__get_set unsigned tileGid;
     tolua_readonly tolua_property__get_set Sprite2D* tileSprite;
 };

Source/Urho3D/Urho2D/TileMap2D.cpp

@@ -185,7 +185,7 @@ ResourceRef TileMap2D::GetTmxFileAttr() const
     return GetResourceRef(tmxFile_, TmxFile2D::GetTypeStatic());
 }
 
-Vector<SharedPtr<TileMapObject2D> > TileMap2D::GetTileCollisionShapes(int gid) const
+Vector<SharedPtr<TileMapObject2D> > TileMap2D::GetTileCollisionShapes(unsigned gid) const
 {
     Vector<SharedPtr<TileMapObject2D> > shapes;
     return tmxFile_ ? tmxFile_->GetTileCollisionShapes(gid) : shapes;

Source/Urho3D/Urho2D/TileMap2D.h

@@ -73,7 +73,7 @@ public:
     /// Return tile map file attribute.
     ResourceRef GetTmxFileAttr() const;
     ///
-    Vector<SharedPtr<TileMapObject2D> > GetTileCollisionShapes(int gid) const;
+    Vector<SharedPtr<TileMapObject2D> > GetTileCollisionShapes(unsigned gid) const;
 private:
     /// Tmx file.
     SharedPtr<TmxFile2D> tmxFile_;

Source/Urho3D/Urho2D/TileMapDefs2D.h

@@ -133,7 +133,7 @@ public:
     Tile2D();
 
     /// Return gid.
-    int GetGid() const { return gid_ & ~FLIP_ALL; }
+    unsigned GetGid() const { return gid_ & ~FLIP_ALL; }
     /// Return flip X.
     bool GetFlipX() const { return gid_ & FLIP_HORIZONTAL; }
     /// Return flip Y.
@@ -186,7 +186,7 @@ public:
     const Vector2& GetPoint(unsigned index) const;
 
     /// Return tile Gid.
-    int GetTileGid() const { return gid_ & ~FLIP_ALL; }
+    unsigned GetTileGid() const { return gid_ & ~FLIP_ALL; }
     /// Return tile flip X.
     bool GetTileFlipX() const { return gid_ & FLIP_HORIZONTAL; }
     /// Return tile flip Y.

Source/Urho3D/Urho2D/TmxFile2D.cpp

@@ -555,28 +555,28 @@ void TmxFile2D::AddLayer(TmxLayer2D *layer)
     layers_.Push(layer);
 }
 
-Sprite2D* TmxFile2D::GetTileSprite(int gid) const
+Sprite2D* TmxFile2D::GetTileSprite(unsigned gid) const
 {
-    HashMap<int, SharedPtr<Sprite2D> >::ConstIterator i = gidToSpriteMapping_.Find(gid);
+    HashMap<unsigned, SharedPtr<Sprite2D> >::ConstIterator i = gidToSpriteMapping_.Find(gid);
     if (i == gidToSpriteMapping_.End())
         return nullptr;
 
     return i->second_;
 }
 
-Vector<SharedPtr<TileMapObject2D> > TmxFile2D::GetTileCollisionShapes(int gid) const
+Vector<SharedPtr<TileMapObject2D> > TmxFile2D::GetTileCollisionShapes(unsigned gid) const
 {
     Vector<SharedPtr<TileMapObject2D> > tileShapes;
-    HashMap<int, Vector<SharedPtr<TileMapObject2D> > >::ConstIterator i = gidToCollisionShapeMapping_.Find(gid);
+    HashMap<unsigned, Vector<SharedPtr<TileMapObject2D> > >::ConstIterator i = gidToCollisionShapeMapping_.Find(gid);
     if (i == gidToCollisionShapeMapping_.End())
         return tileShapes;
 
     return i->second_;
 }
 
-PropertySet2D* TmxFile2D::GetTilePropertySet(int gid) const
+PropertySet2D* TmxFile2D::GetTilePropertySet(unsigned gid) const
 {
-    HashMap<int, SharedPtr<PropertySet2D> >::ConstIterator i = gidToPropertySetMapping_.Find(gid);
+    HashMap<unsigned, SharedPtr<PropertySet2D> >::ConstIterator i = gidToPropertySetMapping_.Find(gid);
     if (i == gidToPropertySetMapping_.End())
         return nullptr;
     return i->second_;
@@ -613,7 +613,7 @@ SharedPtr<XMLFile> TmxFile2D::LoadTSXFile(const String& source)
 
 struct TileImageInfo {
     Image* image;
-    int tileGid;
+    unsigned tileGid;
     int imageWidth;
     int imageHeight;
     int x;
@@ -622,7 +622,7 @@ struct TileImageInfo {
 
 bool TmxFile2D::LoadTileSet(const XMLElement& element)
 {
-    int firstgid = element.GetInt("firstgid");
+    unsigned firstgid = element.GetUInt("firstgid");
 
     XMLElement tileSetElem;
     if (element.HasAttribute("source"))
@@ -680,7 +680,7 @@ bool TmxFile2D::LoadTileSet(const XMLElement& element)
             imageWidth = imageElem.GetInt("width");
             imageHeight = imageElem.GetInt("height");
 
-            int gid = firstgid;
+            unsigned gid = firstgid;
             for (int y = margin; y + tileHeight <= imageHeight - margin; y += tileHeight + spacing)
             {
                 for (int x = margin; x + tileWidth <= imageWidth - margin; x += tileWidth + spacing)
@@ -699,7 +699,7 @@ bool TmxFile2D::LoadTileSet(const XMLElement& element)
     Vector<TileImageInfo> tileImageInfos;
     for (XMLElement tileElem = tileSetElem.GetChild("tile"); tileElem; tileElem = tileElem.GetNext("tile"))
     {
-        int gid = firstgid + tileElem.GetInt("id");
+        unsigned gid = firstgid + tileElem.GetUInt("id");
         // Tileset based on collection of images
         if (!isSingleTileSet)
         {

Source/Urho3D/Urho2D/TmxFile2D.h

@@ -184,13 +184,13 @@ public:
     const TileMapInfo2D& GetInfo() const { return info_; }
 
     /// Return tile sprite by gid, if not exist return 0.
-    Sprite2D* GetTileSprite(int gid) const;
+    Sprite2D* GetTileSprite(unsigned gid) const;
 
     /// Return tile collision shapes for a given gid.
-    Vector<SharedPtr<TileMapObject2D> > GetTileCollisionShapes(int gid) const;
+    Vector<SharedPtr<TileMapObject2D> > GetTileCollisionShapes(unsigned gid) const;
 
     /// Return tile property set by gid, if not exist return 0.
-    PropertySet2D* GetTilePropertySet(int gid) const;
+    PropertySet2D* GetTilePropertySet(unsigned gid) const;
 
     /// Return number of layers.
     unsigned GetNumLayers() const { return layers_.Size(); }
@@ -217,11 +217,11 @@ private:
     /// Tile map information.
     TileMapInfo2D info_;
     /// Gid to tile sprite mapping.
-    HashMap<int, SharedPtr<Sprite2D> > gidToSpriteMapping_;
+    HashMap<unsigned, SharedPtr<Sprite2D> > gidToSpriteMapping_;
     /// Gid to tile property set mapping.
-    HashMap<int, SharedPtr<PropertySet2D> > gidToPropertySetMapping_;
+    HashMap<unsigned, SharedPtr<PropertySet2D> > gidToPropertySetMapping_;
     /// Gid to tile collision shape mapping.
-    HashMap<int, Vector<SharedPtr<TileMapObject2D> > > gidToCollisionShapeMapping_;
+    HashMap<unsigned, Vector<SharedPtr<TileMapObject2D> > > gidToCollisionShapeMapping_;
     /// Layers.
     Vector<TmxLayer2D*> layers_;
     /// Texture edge offset.