From: Arvid Norlander <anmaster@berlios.de>
Date: Sat, 3 Feb 2007 19:09:08 +0000 (+0000)
Subject: Merged more tiles.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=627a9f9fdb9caf73d71ba195ae2094d32c341099;p=supertux.git

Merged more tiles.

SVN-Revision: 4788
---

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 95df10ee8..c24b8c995 100644
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -2212,57 +2212,31 @@
     (solid #t)
     (anim-fps 10)
   )
-  (tile
-    (id 313)
-    (images
-      "tiles/doodads/stone1_1.png"
-    )
-  )
-  (tile
-    (id 314)
-    (images
-      "tiles/doodads/stone1_2.png"
-    )
-  )
-  (tile
-    (id 315)
-    (images
-      "tiles/doodads/stone1_3.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 316)
-    (images
-      "tiles/doodads/stone1_4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 317)
-    (images
-      "tiles/doodads/stone2_1.png"
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      313 314
+      315 316
     )
-  )
-  (tile
-    (id 318)
-    (images
-      "tiles/doodads/stone2_2.png"
+    (attributes
+      0 0
+      1 1
     )
+    (image "tiles/doodads/stone1.png")
   )
-  (tile
-    (id 319)
-    (images
-      "tiles/doodads/stone2_3.png"
+  (tiles
+    (width 2)
+    (height 2)
+    (ids
+      317 318
+      319 320
     )
-    (solid #t)
-  )
-  (tile
-    (id 320)
-    (images
-      "tiles/doodads/stone2_4.png"
+    (attributes
+      0 0
+      1 1
     )
-    (solid #t)
+    (image "tiles/doodads/stone2.png")
   )
   (tile
     (id 321)
@@ -2277,53 +2251,22 @@
       "tiles/doodads/plant1.png"
     )
   )
-  (tile
-    (id 323)
-    (images
-      "tiles/doodads/liane1.png"
-    )
-  )
-  (tile
-    (id 324)
-    (images
-      "tiles/doodads/liane2.png"
-    )
-  )
-  (tile
-    (id 325)
-    (images
-      "tiles/doodads/liane3.png"
-    )
-  )
-  (tile
-    (id 326)
-    (images
-      "tiles/doodads/liane4.png"
-    )
-  )
-  (tile
-    (id 327)
-    (images
-      "tiles/doodads/liane5.png"
-    )
-  )
-  (tile
-    (id 328)
-    (images
-      "tiles/doodads/liane6.png"
-    )
-  )
-  (tile
-    (id 329)
-    (images
-      "tiles/doodads/liane7.png"
+  (tiles
+    (width 2)
+    (height 4)
+    (ids
+      323 324
+      325 326
+      327 328
+      329 330
     )
-  )
-  (tile
-    (id 330)
-    (images
-      "tiles/doodads/liane8.png"
+    (attributes
+      0 0
+      0 0
+      0 0
+      0 0
     )
+    (image "tiles/doodads/liane.png")
   )
   (tile
     (id 337)
diff --git a/data/images/tiles/doodads/liane.png b/data/images/tiles/doodads/liane.png
new file mode 100644
index 000000000..6941a42db
Binary files /dev/null and b/data/images/tiles/doodads/liane.png differ
diff --git a/data/images/tiles/doodads/liane1.png b/data/images/tiles/doodads/liane1.png
deleted file mode 100644
index c7cf10108..000000000
Binary files a/data/images/tiles/doodads/liane1.png and /dev/null differ
diff --git a/data/images/tiles/doodads/liane2.png b/data/images/tiles/doodads/liane2.png
deleted file mode 100644
index 87ab928df..000000000
Binary files a/data/images/tiles/doodads/liane2.png and /dev/null differ
diff --git a/data/images/tiles/doodads/liane3.png b/data/images/tiles/doodads/liane3.png
deleted file mode 100644
index 9dd1a7cae..000000000
Binary files a/data/images/tiles/doodads/liane3.png and /dev/null differ
diff --git a/data/images/tiles/doodads/liane4.png b/data/images/tiles/doodads/liane4.png
deleted file mode 100644
index 3f531af55..000000000
Binary files a/data/images/tiles/doodads/liane4.png and /dev/null differ
diff --git a/data/images/tiles/doodads/liane5.png b/data/images/tiles/doodads/liane5.png
deleted file mode 100644
index 1da341e5d..000000000
Binary files a/data/images/tiles/doodads/liane5.png and /dev/null differ
diff --git a/data/images/tiles/doodads/liane6.png b/data/images/tiles/doodads/liane6.png
deleted file mode 100644
index b60b0eeb3..000000000
Binary files a/data/images/tiles/doodads/liane6.png and /dev/null differ
diff --git a/data/images/tiles/doodads/liane7.png b/data/images/tiles/doodads/liane7.png
deleted file mode 100644
index 78eb0014b..000000000
Binary files a/data/images/tiles/doodads/liane7.png and /dev/null differ
diff --git a/data/images/tiles/doodads/liane8.png b/data/images/tiles/doodads/liane8.png
deleted file mode 100644
index 3bb6fda50..000000000
Binary files a/data/images/tiles/doodads/liane8.png and /dev/null differ
diff --git a/data/images/tiles/doodads/stone1.png b/data/images/tiles/doodads/stone1.png
new file mode 100644
index 000000000..66804545c
Binary files /dev/null and b/data/images/tiles/doodads/stone1.png differ
diff --git a/data/images/tiles/doodads/stone1_1.png b/data/images/tiles/doodads/stone1_1.png
deleted file mode 100644
index a3656c5eb..000000000
Binary files a/data/images/tiles/doodads/stone1_1.png and /dev/null differ
diff --git a/data/images/tiles/doodads/stone1_2.png b/data/images/tiles/doodads/stone1_2.png
deleted file mode 100644
index 50944808a..000000000
Binary files a/data/images/tiles/doodads/stone1_2.png and /dev/null differ
diff --git a/data/images/tiles/doodads/stone1_3.png b/data/images/tiles/doodads/stone1_3.png
deleted file mode 100644
index fc660afcd..000000000
Binary files a/data/images/tiles/doodads/stone1_3.png and /dev/null differ
diff --git a/data/images/tiles/doodads/stone1_4.png b/data/images/tiles/doodads/stone1_4.png
deleted file mode 100644
index d716b482d..000000000
Binary files a/data/images/tiles/doodads/stone1_4.png and /dev/null differ
diff --git a/data/images/tiles/doodads/stone2.png b/data/images/tiles/doodads/stone2.png
new file mode 100644
index 000000000..eb336c363
Binary files /dev/null and b/data/images/tiles/doodads/stone2.png differ
diff --git a/data/images/tiles/doodads/stone2_1.png b/data/images/tiles/doodads/stone2_1.png
deleted file mode 100644
index 7ff71a639..000000000
Binary files a/data/images/tiles/doodads/stone2_1.png and /dev/null differ
diff --git a/data/images/tiles/doodads/stone2_2.png b/data/images/tiles/doodads/stone2_2.png
deleted file mode 100644
index a6b57f805..000000000
Binary files a/data/images/tiles/doodads/stone2_2.png and /dev/null differ
diff --git a/data/images/tiles/doodads/stone2_3.png b/data/images/tiles/doodads/stone2_3.png
deleted file mode 100644
index 98faded84..000000000
Binary files a/data/images/tiles/doodads/stone2_3.png and /dev/null differ
diff --git a/data/images/tiles/doodads/stone2_4.png b/data/images/tiles/doodads/stone2_4.png
deleted file mode 100644
index 291e4530f..000000000
Binary files a/data/images/tiles/doodads/stone2_4.png and /dev/null differ