projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Two more "WalkingBadguy"s
[supertux.git]
/
src
/
badguy
/
bouncing_snowball.hpp
diff --git
a/src/badguy/bouncing_snowball.hpp
b/src/badguy/bouncing_snowball.hpp
index
ba6c7b2
..
b226590
100644
(file)
--- a/
src/badguy/bouncing_snowball.hpp
+++ b/
src/badguy/bouncing_snowball.hpp
@@
-26,17
+26,17
@@
class BouncingSnowball : public BadGuy
{
public:
BouncingSnowball(const lisp::Lisp& reader);
{
public:
BouncingSnowball(const lisp::Lisp& reader);
- BouncingSnowball(
float pos_x, float pos_y
, Direction d);
+ BouncingSnowball(
const Vector& pos
, Direction d);
void activate();
void write(lisp::Writer& writer);
void activate();
void write(lisp::Writer& writer);
-
HitResponse collision_solid(GameObject& other,
const CollisionHit& hit);
+
void collision_solid(
const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+ virtual BouncingSnowball* clone() const { return new BouncingSnowball(*this); }
+
protected:
bool collision_squished(Player& player);
protected:
bool collision_squished(Player& player);
- bool set_direction;
- Direction initial_direction;
};
#endif
};
#endif