Merged wood blocks

SVN-Revision: 4937

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 1146fc5..9d69c72 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -853,26 +853,16 @@
     (data 1)
     (anim-fps 2)
   )
-  (tile
-    (id 27)
-    (images
-      "tiles/blocks/block1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 28)
-    (images
-      "tiles/blocks/block2.png"
+  (tiles
+    (width 3)
+    (height 1)
+    (ids
+      27 28 29
     )
-    (solid #t)
-  )
-  (tile
-    (id 29)
-    (images
-      "tiles/blocks/block3.png"
+    (attributes
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/blocks/block_horiz.png")
   )
   ; Yes the numbering is extremly odd, backward compatiblity...
   (tiles
@@ -1898,26 +1888,20 @@
     (water #t)
     (anim-fps 10)
   )
-  (tile
-    (id 211)
-    (images
-      "tiles/blocks/block1b.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 212)
-    (images
-      "tiles/blocks/block2b.png"
+  (tiles
+    (width 1)
+    (height 3)
+    (ids
+      211
+      212
+      213
     )
-    (solid #t)
-  )
-  (tile
-    (id 213)
-    (images
-      "tiles/blocks/block3b.png"
+    (attributes
+      1
+      1
+      1
     )
-    (solid #t)
+    (image "tiles/blocks/block_vert.png")
   )
   (tile
     (id 275)

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

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

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

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

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

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

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

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