tiler: Tiler::GetSize can now return a different value for different tiles.

src/font.cpp

@@ -47,7 +47,7 @@ Font::Font(char const *path)
     sprintf(data->name, "<font> %s", path);
 
     data->tiler = Tiler::Register(path, 0, 16, 1.0f);
-    data->size = Tiler::GetSize(data->tiler);
+    data->size = Tiler::GetSize(data->tiler, 0);
 
     drawgroup = DRAWGROUP_BEFORE;
 }

src/tiler.cpp

@@ -68,30 +68,30 @@ void Tiler::Deregister(int id)
     data->tilesets.RemoveSlot(id - 1); /* ID 0 is for the empty tileset */
 }
 
-vec2i Tiler::GetSize(int id)
+vec2i Tiler::GetCount(int id)
 {
     TileSet *tileset = (TileSet *)data->tilesets.GetEntity(id - 1);
 #if !LOL_RELEASE
     if (!tileset)
     {
-        Log::Error("getting size for null tiler #%i\n", id);
+        Log::Error("getting count for null tiler #%i\n", id);
         return 0;
     }
 #endif
-    return tileset->GetSize();
+    return tileset->GetCount();
 }
 
-vec2i Tiler::GetCount(int id)
+vec2i Tiler::GetSize(int id, int tileid)
 {
     TileSet *tileset = (TileSet *)data->tilesets.GetEntity(id - 1);
 #if !LOL_RELEASE
     if (!tileset)
     {
-        Log::Error("getting count for null tiler #%i\n", id);
+        Log::Error("getting size for null tiler #%i\n", id);
         return 0;
     }
 #endif
-    return tileset->GetCount();
+    return tileset->GetSize(tileid);
 }
 
 void Tiler::Bind(uint32_t code)

src/tiler.h

@@ -29,8 +29,8 @@ public:
                         float dilate);
     static void Deregister(int id);
 
-    static vec2i GetSize(int id);
     static vec2i GetCount(int id);
+    static vec2i GetSize(int id, int tileid);
     static void Bind(uint32_t code);
     static void BlitTile(uint32_t code, int x, int y, int z, int o,
                          float *vertex, float *texture);

src/tileset.cpp

@@ -159,14 +159,14 @@ char const *TileSet::GetName()
     return data->name;
 }
 
-vec2i TileSet::GetSize() const
+vec2i TileSet::GetCount() const
 {
-    return data->size;
+    return data->count;
 }
 
-vec2i TileSet::GetCount() const
+vec2i TileSet::GetSize(int tileid) const
 {
-    return data->count;
+    return data->size;
 }
 
 void TileSet::Bind()

src/tileset.h

@@ -41,8 +41,8 @@ protected:
 
 public:
     /* New methods */
-    vec2i GetSize() const;
     vec2i GetCount() const;
+    vec2i GetSize(int tileid) const;
     void Bind();
     void BlitTile(uint32_t id, int x, int y, int z, int o,
                   float *vertex, float *texture);