projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Comment out resizable flag because it blue-screens on Windows
[supertux.git]
/
src
/
object
/
scripted_object.hpp
diff --git
a/src/object/scripted_object.hpp
b/src/object/scripted_object.hpp
index
14e3b03
..
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"
#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 Script
ing::ScriptedObject, public Script
Interface
{
public:
ScriptedObject(const lisp::Lisp& lisp);
{
public:
ScriptedObject(const lisp::Lisp& lisp);
@@
-39,6
+39,8
@@
public:
void update(float elapsed_time);
void draw(DrawingContext& context);
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 ---
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();
float get_velocity_y();
void set_visible(bool visible);
bool is_visible();
+ void set_solid(bool solid);
+ bool is_solid();
std::string get_name();
std::string get_name();
@@
-65,8
+69,6
@@
private:
bool visible;
bool new_vel_set;
Vector new_vel;
bool visible;
bool new_vel_set;
Vector new_vel;
- Physic physic;
};
#endif
};
#endif
-