X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fscripted_object.hpp;h=e7d6f9dbffcb30843c506780af4c74ec27d98d9f;hb=04a3157ef478169b5a3fc05dae00ed6ee6a1fae2;hp=7231d3d24232cdd80f321373f9d8fa7401161445;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git diff --git a/src/object/scripted_object.hpp b/src/object/scripted_object.hpp index 7231d3d24..e7d6f9dbf 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,7 +39,7 @@ public: void update(float elapsed_time); void draw(DrawingContext& context); - + void collision_solid(const CollisionHit& hit); HitResponse collision(GameObject& other, const CollisionHit& hit); @@ -69,8 +69,6 @@ private: bool visible; bool new_vel_set; Vector new_vel; - Physic physic; }; #endif -