From: Arvid Norlander <anmaster@berlios.de>
Date: Sun, 4 Feb 2007 09:52:11 +0000 (+0000)
Subject: Merged pipe tile images.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f60589f4f1c4eaf82e4b64495042f1935e4dbb41;p=supertux.git

Merged pipe tile images.

SVN-Revision: 4791
---

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index c24b8c995..c8c0d4801 100644
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -865,63 +865,33 @@
     )
     (image "tiles/blocks/bigblock.png")
   )
-  (tile
-    (id 53)
-    (images
-      "tiles/pipe/pipe1.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 54)
-    (images
-      "tiles/pipe/pipe2.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 55)
-    (images
-      "tiles/pipe/pipe3.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 56)
-    (images
-      "tiles/pipe/pipe4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    ; NOT a dupe of tile 2043
-    (id 57)
-    (images
-      "tiles/pipe/pipe5.png"
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      53 55 1744
+      54 56 1745
     )
-    (solid #t)
-  )
-  (tile
-    ; NOT a dupe of tile 2044
-    (id 58)
-    (images
-      "tiles/pipe/pipe6.png"
+    (attributes
+      1 1 1
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/pipe/pipeh.png")
   )
-  (tile
-    (id 59)
-    (images
-      "tiles/pipe/pipe7.png"
+  (tiles
+    (width 2)
+    (height 3)
+    (ids
+      57   58
+      59   60
+      1742 1743
     )
-    (solid #t)
-  )
-  (tile
-    (id 60)
-    (images
-      "tiles/pipe/pipe8.png"
+    (attributes
+      1 1
+      1 1
+      1 1
     )
-    (solid #t)
+    (image "tiles/pipe/pipev.png")
   )
   (tile
     (id 61)
@@ -6172,19 +6142,7 @@
     )
     (image "tiles/darksnow/wall.png")
   )
-  (tiles
-    (width 2)
-    (height 2)
-    (ids
-      1742 1743
-      1744 1745
-    )
-    (attributes
-      1 1
-      1 1
-    )
-    (image "tiles/pipe/mirrored.png")
-  )
+
 ;unisolid Branches. Tile ID  1746-1761
   (tiles
     (width 4)
@@ -6701,7 +6659,7 @@
     ; NOT a dupe of tile 57
     (id 2043)
     (images
-      "tiles/pipe/pipe5.png"
+      (region  "tiles/pipe/pipev.png" 0 0 32 32)
     )
     (solid #t)
     (unisolid #t)
@@ -6710,7 +6668,7 @@
     ; NOT a dupe of tile 58
     (id 2044)
     (images
-      "tiles/pipe/pipe6.png"
+      (region  "tiles/pipe/pipev.png" 32 0 32 32)
     )
     (solid #t)
     (unisolid #t)
diff --git a/data/images/tiles/pipe/mirrored.png b/data/images/tiles/pipe/mirrored.png
deleted file mode 100644
index fd2abadc8..000000000
Binary files a/data/images/tiles/pipe/mirrored.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipe1.png b/data/images/tiles/pipe/pipe1.png
deleted file mode 100644
index a0c017515..000000000
Binary files a/data/images/tiles/pipe/pipe1.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipe2.png b/data/images/tiles/pipe/pipe2.png
deleted file mode 100644
index 9cc906aba..000000000
Binary files a/data/images/tiles/pipe/pipe2.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipe3.png b/data/images/tiles/pipe/pipe3.png
deleted file mode 100644
index f2f9a0309..000000000
Binary files a/data/images/tiles/pipe/pipe3.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipe4.png b/data/images/tiles/pipe/pipe4.png
deleted file mode 100644
index 56a11c949..000000000
Binary files a/data/images/tiles/pipe/pipe4.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipe5.png b/data/images/tiles/pipe/pipe5.png
deleted file mode 100644
index ec7fb371a..000000000
Binary files a/data/images/tiles/pipe/pipe5.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipe6.png b/data/images/tiles/pipe/pipe6.png
deleted file mode 100644
index 9945d94e8..000000000
Binary files a/data/images/tiles/pipe/pipe6.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipe7.png b/data/images/tiles/pipe/pipe7.png
deleted file mode 100644
index 4d60845cb..000000000
Binary files a/data/images/tiles/pipe/pipe7.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipe8.png b/data/images/tiles/pipe/pipe8.png
deleted file mode 100644
index 022c5c9a1..000000000
Binary files a/data/images/tiles/pipe/pipe8.png and /dev/null differ
diff --git a/data/images/tiles/pipe/pipeh.png b/data/images/tiles/pipe/pipeh.png
new file mode 100644
index 000000000..828cf2aa4
Binary files /dev/null and b/data/images/tiles/pipe/pipeh.png differ
diff --git a/data/images/tiles/pipe/pipev.png b/data/images/tiles/pipe/pipev.png
new file mode 100644
index 000000000..d0b91bcc0
Binary files /dev/null and b/data/images/tiles/pipe/pipev.png differ