projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set 'licence' attribute on sound files
[supertux.git]
/
src
/
badguy
/
flyingsnowball.hpp
diff --git
a/src/badguy/flyingsnowball.hpp
b/src/badguy/flyingsnowball.hpp
index
c9fa3fc
..
d82740f
100644
(file)
--- a/
src/badguy/flyingsnowball.hpp
+++ b/
src/badguy/flyingsnowball.hpp
@@
-26,23
+26,21
@@
class FlyingSnowBall : public BadGuy
{
public:
FlyingSnowBall(const lisp::Lisp& reader);
{
public:
FlyingSnowBall(const lisp::Lisp& reader);
- FlyingSnowBall(
float pos_x, float pos_y
);
+ FlyingSnowBall(
const Vector& pos
);
+ void initialize();
void activate();
void write(lisp::Writer& writer);
void active_update(float elapsed_time);
void activate();
void write(lisp::Writer& writer);
void active_update(float elapsed_time);
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+ void collision_solid(const CollisionHit& hit);
+
+ virtual FlyingSnowBall* clone() const { return new FlyingSnowBall(*this); }
+
protected:
protected:
- enum FlyingSnowballMode {
- FLY_UP,
- FLY_DOWN
- };
- FlyingSnowballMode mode;
- bool collision_squished(Player& player);
+ bool collision_squished(GameObject& object);
private:
private:
-
Timer timer
;
+
float normal_propeller_speed
;
Timer puff_timer; /**< time until the next smoke puff is spawned */
};
#endif
Timer puff_timer; /**< time until the next smoke puff is spawned */
};
#endif
-