merged new collision detection branch back into mainline

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

diff --git a/src/object/rock.hpp b/src/object/rock.hpp
index ad4bebc..207095e 100644 (file)
--- a/src/object/rock.hpp
+++ b/src/object/rock.hpp
@@ -34,6 +34,7 @@ public:
   Rock(const lisp::Lisp& reader);
   virtual Rock* clone() const { return new Rock(*this); }
 
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
   void write(lisp::Writer& writer);