projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a bottom and top section to grumbel's blue mountain background. Extended 23...
[supertux.git]
/
src
/
badguy
/
zeekling.hpp
diff --git
a/src/badguy/zeekling.hpp
b/src/badguy/zeekling.hpp
index
1fee377
..
1784237
100644
(file)
--- a/
src/badguy/zeekling.hpp
+++ b/
src/badguy/zeekling.hpp
@@
-28,17
+28,17
@@
class Zeekling : public BadGuy
{
public:
Zeekling(const lisp::Lisp& reader);
{
public:
Zeekling(const lisp::Lisp& reader);
- Zeekling(
float pos_x, float pos_y
, Direction d);
+ Zeekling(
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);
void active_update(float elapsed_time);
void active_update(float elapsed_time);
+ virtual Zeekling* clone() const { return new Zeekling(*this); }
+
protected:
bool collision_squished(Player& player);
protected:
bool collision_squished(Player& player);
- bool set_direction;
- Direction initial_direction;
float speed;
Timer diveRecoverTimer;
float speed;
Timer diveRecoverTimer;
@@
-54,7
+54,6
@@
private:
bool should_we_dive();
void onBumpHorizontal();
void onBumpVertical();
bool should_we_dive();
void onBumpHorizontal();
void onBumpVertical();
-
};
#endif
};
#endif