Changeset 790 for trunk/src/map.cppTweet

Timestamp:

Jul 23, 2011, 11:14:40 PM (10 years ago)

Author:

sam

Message:

tileset: replace the Tiler ID system with real TileSet objects. The only
thing that is still broken is the Layer <--> Map interface.

File:

• trunk/src/map.cpp (modified) (5 diffs)

trunk/src/map.cpp

@@ -34 +34 @@
     friend class Map;
 
-    static int const MAX_TILERS = 128;
+    static int const MAX_TILESETS = 128;
 
 private:
-    int tilers[MAX_TILERS];
+    TileSet *tilesets[MAX_TILESETS];
     int ntilers;
 
@@ -60 +60 @@
 
     char tmp[BUFSIZ];
-    int gids[MapData::MAX_TILERS];
+    int gids[MapData::MAX_TILESETS];
     uint32_t *tiles = NULL;
     int level = 0, orientation = 0, ntiles = 0;
@@ -96 +96 @@
                              || id < gids[n + 1])
                         {
-                            code = (data->tilers[n] << 16) | (id - gids[n]);
+                            Log::Error("tilesets no longer work this way");
+                            //code = (data->tilesets[n] << 16) | (id - gids[n]);
                             break;
                         }
@@ -133 +134 @@
         {
             /* This is a tileset image file. Associate it with firstgid. */
-            data->tilers[data->ntilers] = Tiler::Register(str, 32, 0,
+            data->tilesets[data->ntilers] = Tiler::Register(str, 32, 0,
                                                           sqrtf(2));
             data->ntilers++;
@@ -159 +160 @@
 {
     for (int i = 0; i < data->ntilers; i++)
-        Tiler::Deregister(data->tilers[i]);
+        Tiler::Deregister(data->tilesets[i]);
     for (int i = 0; i < data->nlayers; i++)
         delete data->layers[i];