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 f175037..b3c0a10 100644 (file)
--- 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 (file)
index 0000000..ad16c0a
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 (file)
index 8a19766..0000000
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 (file)
index 47e5de6..0000000
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 (file)
index d5a34fc..0000000
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 (file)
index a63f1db..0000000
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 (file)
index 5ff36bb..0000000
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 (file)
index 172cc2b..0000000
Binary files a/data/images/tiles/background/background6.png and /dev/null differ