projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved over some changes from cvs
[supertux.git]
/
src
/
badguy
/
mrbomb.h
diff --git
a/src/badguy/mrbomb.h
b/src/badguy/mrbomb.h
index
257716f
..
217040a
100644
(file)
--- a/
src/badguy/mrbomb.h
+++ b/
src/badguy/mrbomb.h
@@
-6,12
+6,14
@@
class MrBomb : public BadGuy
{
public:
class MrBomb : public BadGuy
{
public:
- MrBomb(
LispReader
& reader);
+ MrBomb(
const lisp::Lisp
& reader);
MrBomb(float pos_x, float pos_y, Direction d);
void activate();
MrBomb(float pos_x, float pos_y, Direction d);
void activate();
- void write(
Lisp
Writer& writer);
+ void write(
lisp::
Writer& writer);
HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+ HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+ void kill_fall();
protected:
bool collision_squished(Player& player);
protected:
bool collision_squished(Player& player);