projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted bigger parts of tuxdev patch:
[supertux.git]
/
src
/
badguy
/
mrbomb.hpp
diff --git
a/src/badguy/mrbomb.hpp
b/src/badguy/mrbomb.hpp
index
5aa053a
..
845c063
100644
(file)
--- a/
src/badguy/mrbomb.hpp
+++ b/
src/badguy/mrbomb.hpp
@@
-20,19
+20,15
@@
#ifndef __MRBOMB_H__
#define __MRBOMB_H__
#ifndef __MRBOMB_H__
#define __MRBOMB_H__
-#include "badguy.hpp"
+#include "
walking_
badguy.hpp"
-class MrBomb : public
BadG
uy
+class MrBomb : public
WalkingBadg
uy
{
public:
MrBomb(const lisp::Lisp& reader);
MrBomb(const Vector& pos, Direction d);
{
public:
MrBomb(const lisp::Lisp& reader);
MrBomb(const Vector& pos, Direction d);
- void activate();
- void active_update(float elapsed_time);
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
- void collision_solid(const CollisionHit& hit);
- HitResponse collision_badguy(BadGuy& badguy);
void kill_fall();
virtual MrBomb* clone() const { return new MrBomb(*this); }
void kill_fall();
virtual MrBomb* clone() const { return new MrBomb(*this); }
@@
-42,4
+38,3
@@
protected:
};
#endif
};
#endif
-