X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Frock.cpp;h=7c56e1afcba5e517494ee5be08f48fd6674a03ec;hb=1dfbd27a41341f26775ca4e2b9ca4864f5744a6f;hp=255a4e6de0542ba8293b0bb4aff5eb17cd2e478d;hpb=381dd34488c553c853f4e466f61fb9afb9414761;p=supertux.git

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 255a4e6de..7c56e1afc 100644
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -91,7 +91,7 @@ Rock::collision_solid(const CollisionHit& hit)
   if(hit.crush)
     physic.set_velocity(0, 0);
 
-  if(hit.bottom  && !on_ground) {
+  if(hit.bottom  && !on_ground && !grabbed) {
     sound_manager->play(ROCK_SOUND, get_pos());
     on_ground = true;
   }
@@ -123,7 +123,7 @@ Rock::grab(MovingObject& , const Vector& pos, Direction)
   movement = pos - get_pos();
   last_movement = movement;
   set_group(COLGROUP_TOUCHABLE);
-  on_ground = true;
+  on_ground = false;
   grabbed = true;
 }