From: LMH <lmh.0013@gmail.com>
Date: Sat, 18 Oct 2014 00:51:03 +0000 (-1000)
Subject: Added a halloween themed brick covered with cobwebs
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0fc674b7c864e05a4c19acd6f77d28bfea535615;p=supertux.git

Added a halloween themed brick covered with cobwebs
---

diff --git a/data/images/objects/bonus_block/brickWeb.sprite b/data/images/objects/bonus_block/brickWeb.sprite
new file mode 100644
index 000000000..fc6f9f993
--- /dev/null
+++ b/data/images/objects/bonus_block/brickWeb.sprite
@@ -0,0 +1,8 @@
+(supertux-sprite
+      (action
+        (name "empty")
+        (images "empty.png"))
+      (action
+        (name "normal")
+        (images "../../tiles/blocks/brick2.png"))
+)
diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 617dbc358..0297d2b9a 100644
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -225,8 +225,8 @@
       3122 3108 3109 3127
       3131 3132 3133 3134
 
-      3118 3119 0 0
-      3124 3125 0 0
+      3118 3119 0 3159
+      3124 3125 0 3160
       3128 3129 0 0
       3135 3136 0 0
       ))
@@ -667,7 +667,7 @@
   )
   (tilegroup
     (name "Block")
-    (tiles 27 28 29 47 48 50 49 211 77 51 52 212 78 62 61 213 44 83 2947 2948 84 102 140 103 104 105 112 128 3037 2943 2944 2945 2946 1311 2153)
+    (tiles 27 28 29 47 48 50 49 211 77 51 52 212 78 62 61 213 3159 44 83 2947 2948 84 102 140 103 104 105 3160 112 128 3037 2943 2944 2945 2946 1311 2153)
   )
   (tilegroup
     (name "Background")
@@ -1329,6 +1329,14 @@
     (solid #t)
     (brick #t)
   )
+  (tile
+    (id 3159)
+    (images
+      "tiles/blocks/brick2.png"
+    )
+    (solid #t)
+    (brick #t)
+  )
   (tiles
     (width 1)
     (height 5)
@@ -1470,6 +1478,17 @@
     (data 1)
     (next-tile 84)
   )
+  (tile
+    (id 3160)
+    (images
+      "tiles/blocks/brick2.png"
+    )
+    (editor-images "tiles/blocks/brick2_full.png")
+    (solid #t)
+    (brick #t)
+    (data 1)
+    (next-tile 84)
+  )
   (tiles
     (width 3)
     (height 2)
@@ -4218,5 +4237,5 @@
     )
     (image "tiles/halloween/black.png")
   )
-;; next-id: 3159
+;; next-id: 3161
 )
diff --git a/data/images/tiles/blocks/brick2.png b/data/images/tiles/blocks/brick2.png
new file mode 100644
index 000000000..97471b2b8
Binary files /dev/null and b/data/images/tiles/blocks/brick2.png differ
diff --git a/data/images/tiles/blocks/brick2_full.png b/data/images/tiles/blocks/brick2_full.png
new file mode 100644
index 000000000..856c292a3
Binary files /dev/null and b/data/images/tiles/blocks/brick2_full.png differ
diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
index f67d5b10a..4c666d96e 100644
--- a/src/supertux/sector.cpp
+++ b/src/supertux/sector.cpp
@@ -420,7 +420,9 @@ Sector::fix_old_tiles()
           add_object(std::make_shared<BonusBlock>(pos, tile->getData()));
           solids->change(x, y, 0);
         } else if(tile->getAttributes() & Tile::BRICK) {
-          if( ( id == 78 ) || ( id == 105 ) ){
+          if( ( id == 3159 ) || ( id == 3160 ) ){
+            add_object( std::make_shared<Brick>(pos, tile->getData(), "images/objects/bonus_block/brickWeb.sprite") );
+          } else if( ( id == 78 ) || ( id == 105 ) ){
             add_object( std::make_shared<Brick>(pos, tile->getData(), "images/objects/bonus_block/brickIce.sprite") );
           } else if( ( id == 77 ) || ( id == 104 ) ){
             add_object( std::make_shared<Brick>(pos, tile->getData(), "images/objects/bonus_block/brick.sprite") );