When creating a brick object to handle tiles with attribute brick the…

… iced image is used for icy variant of the tiles (ID 78 and 105).
SuperTux · Oct 26, 2013 · f7b9ecc · f7b9ecc
1 parent 927a356
commit f7b9ecc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/data/images/objects/bonus_block/brickIce.sprite b/data/images/objects/bonus_block/brickIce.sprite
@@ -0,0 +1,8 @@
+(supertux-sprite
+      (action
+        (name "empty")
+        (images "empty.png"))
+      (action
+        (name "normal")
+        (images "../../tiles/blocks/brick1.png"))
+)
diff --git a/src/object/brick.cpp b/src/object/brick.cpp
@@ -26,8 +26,8 @@
 #include "supertux/constants.hpp"
 #include "supertux/sector.hpp"
 
-Brick::Brick(const Vector& pos, int data)
-  : Block(sprite_manager->create("images/objects/bonus_block/brick.sprite")), breakable(false),
+Brick::Brick(const Vector& pos, int data, const std::string& spriteName)
+  : Block(sprite_manager->create(spriteName)), breakable(false),
     coin_counter(0)
 {
   bbox.set_pos(pos);

diff --git a/src/object/brick.hpp b/src/object/brick.hpp
@@ -22,7 +22,7 @@
 class Brick : public Block
 {
 public:
-  Brick(const Vector& pos, int data);
+  Brick(const Vector& pos, int data, const std::string& spriteName);
 
   void try_break(Player* player);
   HitResponse collision(GameObject& other, const CollisionHit& hit);

diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
@@ -421,7 +421,14 @@ Sector::fix_old_tiles()
           add_object(new BonusBlock(pos, tile->getData()));
           solids->change(x, y, 0);
         } else if(tile->getAttributes() & Tile::BRICK) {
-          add_object(new Brick(pos, tile->getData()));
+          if( ( id == 78 ) || ( id == 105 ) ){
+            add_object( new Brick(pos, tile->getData(), "images/objects/bonus_block/brickIce.sprite") );
+          } else if( ( id == 77 ) || ( id == 104 ) ){
+            add_object( new Brick(pos, tile->getData(), "images/objects/bonus_block/brick.sprite") );
+          } else {
+            log_warning << "attribute 'brick #t' is not supported for tile-id " << id << std::endl;
+            add_object( new Brick(pos, tile->getData(), "images/objects/bonus_block/brick.sprite") );
+          }
           solids->change(x, y, 0);
         } else if(tile->getAttributes() & Tile::GOAL) {
           std::string sequence = tile->getData() == 0 ? "endsequence" : "stoptux";