projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made trampolines less likely to interfere with level design:
[supertux.git]
/
src
/
badguy
/
mrrocket.hpp
diff --git
a/src/badguy/mrrocket.hpp
b/src/badguy/mrrocket.hpp
index
25500ec
..
77a7634
100644
(file)
--- a/
src/badguy/mrrocket.hpp
+++ b/
src/badguy/mrrocket.hpp
@@
-28,19
+28,17
@@
class MrRocket : public BadGuy
{
public:
MrRocket(const lisp::Lisp& reader);
{
public:
MrRocket(const lisp::Lisp& reader);
- MrRocket(
float pos_x, float pos_y
, Direction d);
+ MrRocket(
const Vector& pos
, Direction d);
void activate();
void active_update(float elapsed_time);
void write(lisp::Writer& writer);
void activate();
void active_update(float elapsed_time);
void write(lisp::Writer& writer);
-
HitResponse collision_solid(GameObject& other,
const CollisionHit& hit);
+
void collision_solid(
const CollisionHit& hit);
virtual MrRocket* clone() const { return new MrRocket(*this); }
protected:
bool collision_squished(Player& player);
virtual MrRocket* clone() const { return new MrRocket(*this); }
protected:
bool collision_squished(Player& player);
- bool set_direction;
- Direction initial_direction;
Timer collision_timer;
};
Timer collision_timer;
};