svn merge -c-4932 .

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

diff --git a/src/object/scripted_object.hpp b/src/object/scripted_object.hpp
index 2243e3e..e7d6f9d 100644 (file)
--- a/src/object/scripted_object.hpp
+++ b/src/object/scripted_object.hpp
@@ -27,8 +27,8 @@
 #include "script_interface.hpp"
 #include "scripting/scripted_object.hpp"
 
-class ScriptedObject : public MovingSprite, public Scripting::ScriptedObject,
-                       public ScriptInterface
+class ScriptedObject : public MovingSprite, public UsesPhysic,
+                       public Scripting::ScriptedObject, public ScriptInterface
 {
 public:
   ScriptedObject(const lisp::Lisp& lisp);
@@ -39,6 +39,8 @@ public:
 
   void update(float elapsed_time);
   void draw(DrawingContext& context);
+
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
   // --- Scripting Interface stuff ---
@@ -67,8 +69,6 @@ private:
   bool visible;
   bool new_vel_set;
   Vector new_vel;
-  Physic physic;
 };
 
 #endif
-