From: Arvid Norlander <anmaster@berlios.de>
Date: Sat, 3 Feb 2007 17:37:08 +0000 (+0000)
Subject: Merged more tiles.
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=46b8f9843f0abbdc0d1ff7fed41cf9d8790ea527;p=supertux.git

Merged more tiles.

SVN-Revision: 4784
---

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 638d2e735..f175037da 100644
--- 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
index 000000000..14021becf
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
index c85e820ef..000000000
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
index ab503b502..000000000
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
index 7ecca763d..000000000
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
index 6ef729ec0..000000000
Binary files a/data/images/tiles/blocks/block9.png and /dev/null differ