From: Arvid Norlander <anmaster@berlios.de>
Date: Sat, 3 Feb 2007 17:51:25 +0000 (+0000)
Subject: Merged some tiles and removed some unused empty directories
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=50d47b49c7fe9fbfefa0feba3638cfae43e69f6d;p=supertux.git

Merged some tiles and removed some unused empty directories

SVN-Revision: 4785
---

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index f175037da..b3c0a1096 100644
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -1244,41 +1244,18 @@
     (data 1)
     (next-tile 84)
   )
-  (tile
-    (id 106)
-    (images
-      "tiles/background/background1.png"
-    )
-  )
-  (tile
-    (id 107)
-    (images
-      "tiles/background/background2.png"
-    )
-  )
-  (tile
-    (id 108)
-    (images
-      "tiles/background/background3.png"
-    )
-  )
-  (tile
-    (id 109)
-    (images
-      "tiles/background/background4.png"
-    )
-  )
-  (tile
-    (id 110)
-    (images
-      "tiles/background/background5.png"
+  (tiles
+    (width 3)
+    (height 2)
+    (ids
+      106 107 108
+      109 110 111
     )
-  )
-  (tile
-    (id 111)
-    (images
-      "tiles/background/background6.png"
+    (attributes
+      0 0 0
+      0 0 0
     )
+    (image "tiles/background/background.png")
   )
   (tile
     (id 112)
diff --git a/data/images/tiles/background/background.png b/data/images/tiles/background/background.png
new file mode 100644
index 000000000..ad16c0a49
Binary files /dev/null and b/data/images/tiles/background/background.png differ
diff --git a/data/images/tiles/background/background1.png b/data/images/tiles/background/background1.png
deleted file mode 100644
index 8a1976644..000000000
Binary files a/data/images/tiles/background/background1.png and /dev/null differ
diff --git a/data/images/tiles/background/background2.png b/data/images/tiles/background/background2.png
deleted file mode 100644
index 47e5de6b5..000000000
Binary files a/data/images/tiles/background/background2.png and /dev/null differ
diff --git a/data/images/tiles/background/background3.png b/data/images/tiles/background/background3.png
deleted file mode 100644
index d5a34fcee..000000000
Binary files a/data/images/tiles/background/background3.png and /dev/null differ
diff --git a/data/images/tiles/background/background4.png b/data/images/tiles/background/background4.png
deleted file mode 100644
index a63f1dbaf..000000000
Binary files a/data/images/tiles/background/background4.png and /dev/null differ
diff --git a/data/images/tiles/background/background5.png b/data/images/tiles/background/background5.png
deleted file mode 100644
index 5ff36bb4f..000000000
Binary files a/data/images/tiles/background/background5.png and /dev/null differ
diff --git a/data/images/tiles/background/background6.png b/data/images/tiles/background/background6.png
deleted file mode 100644
index 172cc2b00..000000000
Binary files a/data/images/tiles/background/background6.png and /dev/null differ