projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled back bomb to old behaviour, some bomb gfx tuning
[supertux.git]
/
src
/
badguy
/
root.hpp
diff --git
a/src/badguy/root.hpp
b/src/badguy/root.hpp
index
32ec2fa
..
b3a302c
100644
(file)
--- a/
src/badguy/root.hpp
+++ b/
src/badguy/root.hpp
@@
-22,13
+22,14
@@
#include <memory>
#include "badguy.hpp"
#include <memory>
#include "badguy.hpp"
+class Timer;
+
class Root : public BadGuy
{
public:
Root(const Vector& pos);
~Root();
class Root : public BadGuy
{
public:
Root(const Vector& pos);
~Root();
- void activate();
void deactivate();
void active_update(float elapsed_time);
virtual void draw(DrawingContext& context);
void deactivate();
void active_update(float elapsed_time);
virtual void draw(DrawingContext& context);
@@
-38,11
+39,12
@@
public:
protected:
enum MyState {
protected:
enum MyState {
- STATE_APPEARING, STATE_GROWING, STATE_SHRINKING, STATE_VANISHING
+ STATE_APPEARING, STATE_
HATCHING, STATE_
GROWING, STATE_SHRINKING, STATE_VANISHING
};
MyState mystate;
std::auto_ptr<Sprite> base_sprite;
float offset_y;
};
MyState mystate;
std::auto_ptr<Sprite> base_sprite;
float offset_y;
+ Timer hatch_timer;
};
#endif
};
#endif