From: Arvid Norlander <anmaster@berlios.de>
Date: Sat, 3 Feb 2007 15:15:20 +0000 (+0000)
Subject: Merged darksnow 1-12 into one image, also moved some files in media around
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=80fcd1f3ea4ff87fd3f2617d4dfd5db21d02c33c;p=supertux.git

Merged darksnow 1-12 into one image, also moved some files in media around

SVN-Revision: 4779
---

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 5b3d40c2e..1cd0a558b 100644
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -809,86 +809,23 @@
     )
     (solid #t)
   )
-  (tile
-    (id 32)
-    (images
-      "tiles/darksnow/darksnow1.png"
-    )
-  )
-  (tile
-    (id 33)
-    (images
-      "tiles/darksnow/darksnow2.png"
-    )
-  )
-  (tile
-    (id 34)
-    (images
-      "tiles/darksnow/darksnow3.png"
-    )
-  )
-  (tile
-    (id 35)
-    (images
-      "tiles/darksnow/darksnow4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 36)
-    (images
-      "tiles/darksnow/darksnow5.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 37)
-    (images
-      "tiles/darksnow/darksnow6.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 38)
-    (images
-      "tiles/darksnow/darksnow7.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 39)
-    (images
-      "tiles/darksnow/darksnow8.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 40)
-    (images
-      "tiles/darksnow/darksnow9.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 41)
-    (images
-      "tiles/darksnow/darksnow10.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 42)
-    (images
-      "tiles/darksnow/darksnow11.png"
+  ; Yes the numbering is extremly odd, backward compatiblity...
+  (tiles
+    (width 3)
+    (height 4)
+    (ids
+      33 32 34
+      35 37 39
+      38 36 43
+      40 41 42
     )
-    (solid #t)
-  )
-  (tile
-    (id 43)
-    (images
-      "tiles/darksnow/darksnow12.png"
+    (attributes
+      0 0 0
+      1 1 1
+      1 1 1
+      1 1 1
     )
-    (solid #t)
+    (image "tiles/darksnow/convex.png")
   )
   (tile
     (id 44)
diff --git a/data/images/tiles/darksnow/convex.png b/data/images/tiles/darksnow/convex.png
new file mode 100644
index 000000000..472560862
Binary files /dev/null and b/data/images/tiles/darksnow/convex.png differ
diff --git a/data/images/tiles/darksnow/darksnow1.png b/data/images/tiles/darksnow/darksnow1.png
deleted file mode 100644
index 394324c0e..000000000
Binary files a/data/images/tiles/darksnow/darksnow1.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow10.png b/data/images/tiles/darksnow/darksnow10.png
deleted file mode 100644
index 79facda0e..000000000
Binary files a/data/images/tiles/darksnow/darksnow10.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow11.png b/data/images/tiles/darksnow/darksnow11.png
deleted file mode 100644
index 7e636e92c..000000000
Binary files a/data/images/tiles/darksnow/darksnow11.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow12.png b/data/images/tiles/darksnow/darksnow12.png
deleted file mode 100644
index c956b45e8..000000000
Binary files a/data/images/tiles/darksnow/darksnow12.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow2.png b/data/images/tiles/darksnow/darksnow2.png
deleted file mode 100644
index dc33183bc..000000000
Binary files a/data/images/tiles/darksnow/darksnow2.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow3.png b/data/images/tiles/darksnow/darksnow3.png
deleted file mode 100644
index 8a60e6c4a..000000000
Binary files a/data/images/tiles/darksnow/darksnow3.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow4.png b/data/images/tiles/darksnow/darksnow4.png
deleted file mode 100644
index d0683d30b..000000000
Binary files a/data/images/tiles/darksnow/darksnow4.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow5.png b/data/images/tiles/darksnow/darksnow5.png
deleted file mode 100644
index 470434242..000000000
Binary files a/data/images/tiles/darksnow/darksnow5.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow6.png b/data/images/tiles/darksnow/darksnow6.png
deleted file mode 100644
index d32931604..000000000
Binary files a/data/images/tiles/darksnow/darksnow6.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow7.png b/data/images/tiles/darksnow/darksnow7.png
deleted file mode 100644
index e005274bd..000000000
Binary files a/data/images/tiles/darksnow/darksnow7.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow8.png b/data/images/tiles/darksnow/darksnow8.png
deleted file mode 100644
index c4ea50276..000000000
Binary files a/data/images/tiles/darksnow/darksnow8.png and /dev/null differ
diff --git a/data/images/tiles/darksnow/darksnow9.png b/data/images/tiles/darksnow/darksnow9.png
deleted file mode 100644
index 852c2269c..000000000
Binary files a/data/images/tiles/darksnow/darksnow9.png and /dev/null differ