* In the usage help, put LEVELFILE into brackets since it's an optional argument.
[supertux.git] / src / object / block.cpp
index dd2e11c..ac5bc57 100644 (file)
@@ -51,6 +51,7 @@ Block::Block(Sprite* newsprite)
   : sprite(newsprite), bouncing(false), bounce_dir(0), bounce_offset(0)
 {
   bbox.set_size(32, 32.1);
+  set_group(COLGROUP_STATIC);
   flags |= FLAG_SOLID;
 }
 
@@ -203,7 +204,7 @@ void
 BonusBlock::try_open()
 {
   if(sprite->get_action_name() == "empty") {
-    sound_manager->play("sounds/brick.ogg");
+    sound_manager->play("sounds/brick.wav");
     return;
   }
   
@@ -224,7 +225,7 @@ BonusBlock::try_open()
             get_pos(), new Flower(Flower::FIREFLOWER));
         sector->add_object(riser);
       }
-      sound_manager->play("sounds/upgrade.ogg");
+      sound_manager->play("sounds/upgrade.wav");
       break;
 
     case CONTENT_ICEGROW:
@@ -236,7 +237,7 @@ BonusBlock::try_open()
             get_pos(), new Flower(Flower::ICEFLOWER));
         sector->add_object(riser);
       }      
-      sound_manager->play("sounds/upgrade.ogg");
+      sound_manager->play("sounds/upgrade.wav");
       break;
 
     case CONTENT_STAR:
@@ -251,7 +252,7 @@ BonusBlock::try_open()
       SpecialRiser* riser = new SpecialRiser(get_pos(), object);
       object = 0;
       sector->add_object(riser);
-      sound_manager->play("sounds/upgrade.ogg");
+      sound_manager->play("sounds/upgrade.wav");
       break;
 
     //default:
@@ -292,7 +293,7 @@ Brick::try_break(bool playerhit)
   if(sprite->get_action_name() == "empty")
     return;
   
-  sound_manager->play("sounds/brick.ogg");
+  sound_manager->play("sounds/brick.wav");
   Sector* sector = Sector::current();
   Player& player = *(sector->player);
   if(coin_counter > 0) {