X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fscripted_object.hpp;h=9ac72c56e67e4a911a420db87bb15a21cf9114b5;hb=4587bd9c8fc5cbb20f1e442de76bc06571ab56ba;hp=14e3b0394ae2714593dcb7ade36179579f081f68;hpb=15c5a91ee89272dfda3666e2fed67e06d650d0bf;p=supertux.git

diff --git a/src/object/scripted_object.hpp b/src/object/scripted_object.hpp
index 14e3b0394..9ac72c56e 100644
--- 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 ---
@@ -55,6 +57,8 @@ public:
   float get_velocity_y();
   void set_visible(bool visible);
   bool is_visible();
+  void set_solid(bool solid);
+  bool is_solid();
 
   std::string get_name();
 
@@ -65,8 +69,6 @@ private:
   bool visible;
   bool new_vel_set;
   Vector new_vel;
-  Physic physic;
 };
 
 #endif
-