projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Magic Blocks. (DrawingContext::get_light is not working yet.)
[supertux.git]
/
src
/
object
/
scripted_object.hpp
diff --git
a/src/object/scripted_object.hpp
b/src/object/scripted_object.hpp
index
14e3b03
..
1e432a7
100644
(file)
--- a/
src/object/scripted_object.hpp
+++ b/
src/object/scripted_object.hpp
@@
-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();
@@
-69,4
+73,3
@@
private:
};
#endif
};
#endif
-