Merge branch 'feature/sdl2'

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

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 99d7c2c..48dee00 100644 (file)
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -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 */