From: Arvid Norlander <anmaster@berlios.de>
Date: Thu, 8 Mar 2007 09:11:42 +0000 (+0000)
Subject: Merged rock_plate tiles
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=57e9c82023bc874d4173ef1adff21ed0ef98bb8d;p=supertux.git

Merged rock_plate tiles

SVN-Revision: 4936
---

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index ea649714f..1146fc5cf 100644
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -2269,47 +2269,18 @@
     )
     (image "tiles/doodads/liane.png")
   )
-  (tile
-    (id 337)
-    (images
-      "tiles/blocks/rock_plate1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 338)
-    (images
-      "tiles/blocks/rock_plate2.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 339)
-    (images
-      "tiles/blocks/rock_plate3.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 340)
-    (images
-      "tiles/blocks/rock_plate_cracked1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 341)
-    (images
-      "tiles/blocks/rock_plate_cracked2.png"
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      337 338 339
+      340 341 342
     )
-    (solid #t)
-  )
-  (tile
-    (id 342)
-    (images
-      "tiles/blocks/rock_plate_cracked3.png"
+    (attributes
+      1 1 1
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/blocks/rock_plate.png")
   )
 
   ; experimental unisolid tile
diff --git a/data/images/tiles/blocks/rock_plate.png b/data/images/tiles/blocks/rock_plate.png
new file mode 100644
index 000000000..d5266372b
Binary files /dev/null and b/data/images/tiles/blocks/rock_plate.png differ
diff --git a/data/images/tiles/blocks/rock_plate1.png b/data/images/tiles/blocks/rock_plate1.png
deleted file mode 100644
index 9bc90291b..000000000
Binary files a/data/images/tiles/blocks/rock_plate1.png and /dev/null differ
diff --git a/data/images/tiles/blocks/rock_plate2.png b/data/images/tiles/blocks/rock_plate2.png
deleted file mode 100644
index 2dcf90d53..000000000
Binary files a/data/images/tiles/blocks/rock_plate2.png and /dev/null differ
diff --git a/data/images/tiles/blocks/rock_plate3.png b/data/images/tiles/blocks/rock_plate3.png
deleted file mode 100644
index d369d2974..000000000
Binary files a/data/images/tiles/blocks/rock_plate3.png and /dev/null differ
diff --git a/data/images/tiles/blocks/rock_plate_cracked1.png b/data/images/tiles/blocks/rock_plate_cracked1.png
deleted file mode 100644
index 4a040c60a..000000000
Binary files a/data/images/tiles/blocks/rock_plate_cracked1.png and /dev/null differ
diff --git a/data/images/tiles/blocks/rock_plate_cracked2.png b/data/images/tiles/blocks/rock_plate_cracked2.png
deleted file mode 100644
index 1cd4edc85..000000000
Binary files a/data/images/tiles/blocks/rock_plate_cracked2.png and /dev/null differ
diff --git a/data/images/tiles/blocks/rock_plate_cracked3.png b/data/images/tiles/blocks/rock_plate_cracked3.png
deleted file mode 100644
index 430f0f50c..000000000
Binary files a/data/images/tiles/blocks/rock_plate_cracked3.png and /dev/null differ
diff --git a/data/images/tiles/snow/unisolid.png b/data/images/tiles/snow/unisolid.png
index 2604cae46..b5b5f7f52 100644
Binary files a/data/images/tiles/snow/unisolid.png and b/data/images/tiles/snow/unisolid.png differ