projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix
[supertux.git]
/
src
/
badguy
/
kugelblitz.hpp
diff --git
a/src/badguy/kugelblitz.hpp
b/src/badguy/kugelblitz.hpp
index
5e59120
..
2d7ff70
100644
(file)
--- a/
src/badguy/kugelblitz.hpp
+++ b/
src/badguy/kugelblitz.hpp
@@
-22,6
+22,7
@@
#include "badguy.hpp"
#include "timer.hpp"
#include "badguy.hpp"
#include "timer.hpp"
+#include "object/electrifier.hpp"
class Kugelblitz : public BadGuy
{
class Kugelblitz : public BadGuy
{
@@
-39,14
+40,15
@@
public:
void explode();
private:
void explode();
private:
+ void try_activate();
HitResponse hit(const CollisionHit& hit);
Vector pos_groundhit;
bool groundhit_pos_set;
bool dying;
Timer movement_timer;
Timer lifetime;
HitResponse hit(const CollisionHit& hit);
Vector pos_groundhit;
bool groundhit_pos_set;
bool dying;
Timer movement_timer;
Timer lifetime;
- Timer electrify_timer;
int direction;
int direction;
+ State state;
};
#endif
};
#endif