projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix cr/lfs and remove trailing whitespaces...
[supertux.git]
/
src
/
object
/
scripted_object.hpp
diff --git
a/src/object/scripted_object.hpp
b/src/object/scripted_object.hpp
index
7231d3d
..
1e432a7
100644
(file)
--- a/
src/object/scripted_object.hpp
+++ b/
src/object/scripted_object.hpp
@@
-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);
@@
-73,4
+73,3
@@
private:
};
#endif
-