projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warning in rocketexplosion
[supertux.git]
/
src
/
badguy
/
mriceblock.h
diff --git
a/src/badguy/mriceblock.h
b/src/badguy/mriceblock.h
index
3a6d2a6
..
54ec05d
100644
(file)
--- a/
src/badguy/mriceblock.h
+++ b/
src/badguy/mriceblock.h
@@
-11,7
+11,8
@@
public:
void activate();
void write(lisp::Writer& writer);
void activate();
void write(lisp::Writer& writer);
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+ HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
+ HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
void active_action(float elapsed_time);
void active_action(float elapsed_time);