projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore trunk
[supertux.git]
/
src
/
object
/
scripted_object.hpp
diff --git
a/src/object/scripted_object.hpp
b/src/object/scripted_object.hpp
index
9ac72c5
..
e7d6f9d
100644
(file)
--- a/
src/object/scripted_object.hpp
+++ b/
src/object/scripted_object.hpp
@@
-27,7
+27,7
@@
#include "script_interface.hpp"
#include "scripting/scripted_object.hpp"
#include "script_interface.hpp"
#include "scripting/scripted_object.hpp"
-class ScriptedObject : public MovingSprite, public UsesPhysic,
+class ScriptedObject : public MovingSprite, public UsesPhysic,
public Scripting::ScriptedObject, public ScriptInterface
{
public:
public Scripting::ScriptedObject, public ScriptInterface
{
public: