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
018e1e0
..
845c063
100644
(file)
--- a/
src/badguy/mrbomb.hpp
+++ b/
src/badguy/mrbomb.hpp
@@
-20,25
+20,21
@@
#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);
{
public:
MrBomb(const lisp::Lisp& reader);
- MrBomb(
float pos_x, float pos_y
, Direction d);
+ MrBomb(
const Vector& pos
, Direction d);
- void activate();
- void active_update(float elapsed_time);
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
- HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+ void kill_fall();
+
+ virtual MrBomb* clone() const { return new MrBomb(*this); }
protected:
bool collision_squished(Player& player);
protected:
bool collision_squished(Player& player);
- bool set_direction;
- Direction initial_direction;
};
#endif
};
#endif
-