Merged more tile images.

SVN-Revision: 4796

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 465ae26..cc96546 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -236,7 +236,6 @@
       89   90   91   92
       93   94   95   96
       97   98   99   100
-      101  0    0    0
       1321 1322 1323 1324
       1325 1326 1327 1328
       1329 1330 1331 1332
@@ -1088,60 +1087,25 @@
     )
     (image "tiles/background/cloud.png")
   )
-  (tile
-    ; dupe of tile 101, this one will be kept.
-    (id 93)
-    (images
-      "tiles/background/bkgd-00.png"
-    )
-  )
-  (tile
-    (id 94)
-    (images
-      "tiles/background/bkgd-01.png"
-    )
-  )
-  (tile
-    (id 95)
-    (images
-      "tiles/background/bkgd-02.png"
-    )
-  )
-  (tile
-    (id 96)
-    (images
-      "tiles/background/bkgd-03.png"
-    )
-  )
-  (tile
-    (id 97)
-    (images
-      "tiles/background/bkgd-10.png"
-    )
-  )
-  (tile
-    (id 98)
-    (images
-      "tiles/background/bkgd-11.png"
-    )
-  )
-  (tile
-    (id 99)
-    (images
-      "tiles/background/bkgd-12.png"
+  (tiles
+    ; 93 is a dupe of tile 101, 93 will be kept.
+    (width 4)
+    (height 2)
+    (ids
+      93 94 95 96
+      97 98 99 100
     )
-  )
-  (tile
-    (id 100)
-    (images
-      "tiles/background/bkgd-13.png"
+    (attributes
+      0 0 0 0
+      0 0 0 0
     )
+    (image "tiles/background/bkgd.png")
   )
   (tile
     ; dupe of tile 93, this one will be removed.
     (id 101)
     (images
-      "tiles/background/bkgd-00.png"
+      (region "tiles/background/bkgd.png" 0 0 32 32)
     )
   )
   (tile

diff --git a/data/images/tiles/background/bkgd-00.png b/data/images/tiles/background/bkgd-00.png
deleted file mode 100644 (file)
index da266e1..0000000
Binary files a/data/images/tiles/background/bkgd-00.png and /dev/null differ

diff --git a/data/images/tiles/background/bkgd-01.png b/data/images/tiles/background/bkgd-01.png
deleted file mode 100644 (file)
index cceac82..0000000
Binary files a/data/images/tiles/background/bkgd-01.png and /dev/null differ

diff --git a/data/images/tiles/background/bkgd-02.png b/data/images/tiles/background/bkgd-02.png
deleted file mode 100644 (file)
index 56e7b88..0000000
Binary files a/data/images/tiles/background/bkgd-02.png and /dev/null differ

diff --git a/data/images/tiles/background/bkgd-03.png b/data/images/tiles/background/bkgd-03.png
deleted file mode 100644 (file)
index d530ce2..0000000
Binary files a/data/images/tiles/background/bkgd-03.png and /dev/null differ

diff --git a/data/images/tiles/background/bkgd-10.png b/data/images/tiles/background/bkgd-10.png
deleted file mode 100644 (file)
index df732b3..0000000
Binary files a/data/images/tiles/background/bkgd-10.png and /dev/null differ

diff --git a/data/images/tiles/background/bkgd-11.png b/data/images/tiles/background/bkgd-11.png
deleted file mode 100644 (file)
index 028fafe..0000000
Binary files a/data/images/tiles/background/bkgd-11.png and /dev/null differ

diff --git a/data/images/tiles/background/bkgd-12.png b/data/images/tiles/background/bkgd-12.png
deleted file mode 100644 (file)
index f1c65e4..0000000
Binary files a/data/images/tiles/background/bkgd-12.png and /dev/null differ

diff --git a/data/images/tiles/background/bkgd-13.png b/data/images/tiles/background/bkgd-13.png
deleted file mode 100644 (file)
index 22a6303..0000000
Binary files a/data/images/tiles/background/bkgd-13.png and /dev/null differ

diff --git a/data/images/tiles/background/bkgd.png b/data/images/tiles/background/bkgd.png
new file mode 100644 (file)
index 0000000..16e7b5f
Binary files /dev/null and b/data/images/tiles/background/bkgd.png differ