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
/
kugelblitz.hpp
diff --git
a/src/badguy/kugelblitz.hpp
b/src/badguy/kugelblitz.hpp
index
a9c64ba
..
b169997
100644
(file)
--- a/
src/badguy/kugelblitz.hpp
+++ b/
src/badguy/kugelblitz.hpp
@@
-29,9
+29,9
@@
class Kugelblitz : public BadGuy
public:
Kugelblitz(const lisp::Lisp& reader);
public:
Kugelblitz(const lisp::Lisp& reader);
- void
activat
e();
+ void
initializ
e();
HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
-
HitResponse collision_solid(GameObject& other,
const CollisionHit& hit);
+
void collision_solid(
const CollisionHit& hit);
HitResponse collision_player(Player& player, const CollisionHit& hit);
void write(lisp::Writer& writer);
HitResponse collision_player(Player& player, const CollisionHit& hit);
void write(lisp::Writer& writer);
@@
-54,4
+54,3
@@
private:
};
#endif
};
#endif
-