projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more aspect ratio stuff
[supertux.git]
/
src
/
badguy
/
snowball.hpp
diff --git
a/src/badguy/snowball.hpp
b/src/badguy/snowball.hpp
index
49bfa9f
..
ef32818
100644
(file)
--- a/
src/badguy/snowball.hpp
+++ b/
src/badguy/snowball.hpp
@@
-20,24
+20,20
@@
#ifndef __SNOWBALL_H__
#define __SNOWBALL_H__
#ifndef __SNOWBALL_H__
#define __SNOWBALL_H__
-#include "badguy.hpp"
+#include "
walking_
badguy.hpp"
-class SnowBall : public
BadG
uy
+class SnowBall : public
WalkingBadg
uy
{
public:
SnowBall(const lisp::Lisp& reader);
SnowBall(const Vector& pos, Direction d);
{
public:
SnowBall(const lisp::Lisp& reader);
SnowBall(const Vector& pos, Direction d);
- void activate();
void write(lisp::Writer& writer);
void write(lisp::Writer& writer);
- HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
- HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
-
virtual SnowBall* clone() const { return new SnowBall(*this); }
protected:
virtual SnowBall* clone() const { return new SnowBall(*this); }
protected:
- bool collision_squished(Player& player);
+ bool collision_squished(GameObject& object);
+
};
#endif
};
#endif
-