projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled back bomb to old behaviour, some bomb gfx tuning
[supertux.git]
/
src
/
badguy
/
mrrocket.hpp
diff --git
a/src/badguy/mrrocket.hpp
b/src/badguy/mrrocket.hpp
index
11ae037
..
4ff1209
100644
(file)
--- a/
src/badguy/mrrocket.hpp
+++ b/
src/badguy/mrrocket.hpp
@@
-22,7
+22,6
@@
#include "badguy.hpp"
#include "timer.hpp"
#include "badguy.hpp"
#include "timer.hpp"
-#include "rocketexplosion.hpp"
class MrRocket : public BadGuy
{
class MrRocket : public BadGuy
{
@@
-30,7
+29,7
@@
public:
MrRocket(const lisp::Lisp& reader);
MrRocket(const Vector& pos, Direction d);
MrRocket(const lisp::Lisp& reader);
MrRocket(const Vector& pos, Direction d);
- void
activat
e();
+ void
initializ
e();
void active_update(float elapsed_time);
void write(lisp::Writer& writer);
void collision_solid(const CollisionHit& hit);
void active_update(float elapsed_time);
void write(lisp::Writer& writer);
void collision_solid(const CollisionHit& hit);
@@
-38,7
+37,7
@@
public:
virtual MrRocket* clone() const { return new MrRocket(*this); }
protected:
virtual MrRocket* clone() const { return new MrRocket(*this); }
protected:
- bool collision_squished(
Player& player
);
+ bool collision_squished(
GameObject& object
);
Timer collision_timer;
};
Timer collision_timer;
};