projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating cherrybomb, adding juicebox (blue bomb).
[supertux.git]
/
src
/
badguy
/
skullyhop.hpp
diff --git
a/src/badguy/skullyhop.hpp
b/src/badguy/skullyhop.hpp
index
6e86119
..
c12962c
100644
(file)
--- a/
src/badguy/skullyhop.hpp
+++ b/
src/badguy/skullyhop.hpp
@@
-30,7
+30,7
@@
class SkullyHop : public BadGuy
{
public:
SkullyHop(const lisp::Lisp& reader);
{
public:
SkullyHop(const lisp::Lisp& reader);
- SkullyHop(
float pos_x, float pos_y
, Direction d);
+ SkullyHop(
const Vector& pos
, Direction d);
void activate();
void write(lisp::Writer& writer);
void activate();
void write(lisp::Writer& writer);
@@
-39,6
+39,8
@@
public:
bool collision_squished(Player& player);
void active_update(float elapsed_time);
bool collision_squished(Player& player);
void active_update(float elapsed_time);
+ virtual SkullyHop* clone() const { return new SkullyHop(*this); }
+
protected:
enum SkullyHopState {
STANDING,
protected:
enum SkullyHopState {
STANDING,
@@
-46,9
+48,6
@@
protected:
JUMPING
};
JUMPING
};
- bool has_initial_direction;
- Direction initial_direction;
-
Timer recover_timer;
SkullyHopState state;
Timer recover_timer;
SkullyHopState state;