Remove bogus assert

[supertux.git] / src / object / rock.cpp

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 99d7c2c..8f60e66 100644 (file)
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -30,7 +30,7 @@ Rock::Rock(const Vector& pos, std::string spritename) :
   grabbed(),
   last_movement()
 {
-  sound_manager->preload(ROCK_SOUND);
+  SoundManager::current()->preload(ROCK_SOUND);
   on_ground = false;
   grabbed = false;
   set_group(COLGROUP_MOVING_STATIC);
@@ -43,7 +43,7 @@ Rock::Rock(const Reader& reader) :
   grabbed(),
   last_movement()
 {
-  sound_manager->preload(ROCK_SOUND);
+  SoundManager::current()->preload(ROCK_SOUND);
   on_ground = false;
   grabbed = false;
   set_group(COLGROUP_MOVING_STATIC);
@@ -56,7 +56,7 @@ Rock::Rock(const Reader& reader, std::string spritename) :
   grabbed(),
   last_movement()
 {
-  sound_manager->preload(ROCK_SOUND);
+  SoundManager::current()->preload(ROCK_SOUND);
   on_ground = false;
   grabbed = false;
   set_group(COLGROUP_MOVING_STATIC);
@@ -87,7 +87,7 @@ Rock::collision_solid(const CollisionHit& hit)
     physic.set_velocity(0, 0);
 
   if(hit.bottom  && !on_ground && !grabbed) {
-    sound_manager->play(ROCK_SOUND, get_pos());
+    SoundManager::current()->play(ROCK_SOUND, get_pos());
     on_ground = true;
   }
 }
@@ -117,7 +117,7 @@ Rock::grab(MovingObject& , const Vector& pos, Direction)
 {
   movement = pos - get_pos();
   last_movement = movement;
-  set_group(COLGROUP_DISABLED);
+  set_group(COLGROUP_TOUCHABLE); //needed for lanterns catching willowisps
   on_ground = false;
   grabbed = true;
 }
@@ -137,6 +137,5 @@ Rock::ungrab(MovingObject& , Direction dir)
   grabbed = false;
 }
 
-IMPLEMENT_FACTORY(Rock, "rock");
 
 /* EOF */