Merged more tiles.

SVN-Revision: 4784

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 638d2e7..f175037 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -856,33 +856,18 @@
     )
     (solid #t)
   )
-  (tile
-    (id 49)
-    (images
-      "tiles/blocks/block6.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 50)
-    (images
-      "tiles/blocks/block7.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 51)
-    (images
-      "tiles/blocks/block8.png"
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      50 49
+      51 52
     )
-    (solid #t)
-  )
-  (tile
-    (id 52)
-    (images
-      "tiles/blocks/block9.png"
+    (attributes
+      1 1
+      1 1
     )
-    (solid #t)
+    (image "tiles/blocks/bigblock.png")
   )
   (tile
     (id 53)

diff --git a/data/images/tiles/blocks/bigblock.png b/data/images/tiles/blocks/bigblock.png
new file mode 100644 (file)
index 0000000..14021be
Binary files /dev/null and b/data/images/tiles/blocks/bigblock.png differ

diff --git a/data/images/tiles/blocks/block6.png b/data/images/tiles/blocks/block6.png
deleted file mode 100644 (file)
index c85e820..0000000
Binary files a/data/images/tiles/blocks/block6.png and /dev/null differ

diff --git a/data/images/tiles/blocks/block7.png b/data/images/tiles/blocks/block7.png
deleted file mode 100644 (file)
index ab503b5..0000000
Binary files a/data/images/tiles/blocks/block7.png and /dev/null differ

diff --git a/data/images/tiles/blocks/block8.png b/data/images/tiles/blocks/block8.png
deleted file mode 100644 (file)
index 7ecca76..0000000
Binary files a/data/images/tiles/blocks/block8.png and /dev/null differ

diff --git a/data/images/tiles/blocks/block9.png b/data/images/tiles/blocks/block9.png
deleted file mode 100644 (file)
index 6ef729e..0000000
Binary files a/data/images/tiles/blocks/block9.png and /dev/null differ