merged new collision detection branch back into mainline

[supertux.git] / src / badguy / mrtree.hpp

diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp
index 652a00e..02a433d 100644 (file)
--- a/src/badguy/mrtree.hpp
+++ b/src/badguy/mrtree.hpp
@@ -30,7 +30,7 @@ public:
   void activate();
   void active_update(float elapsed_time);
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
 
   virtual MrTree* clone() const { return new MrTree(*this); }