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
/
bomb.hpp
diff --git
a/src/badguy/bomb.hpp
b/src/badguy/bomb.hpp
index
40b29d0
..
e75a32f
100644
(file)
--- a/
src/badguy/bomb.hpp
+++ b/
src/badguy/bomb.hpp
@@
-25,7
+25,7
@@
class Bomb : public BadGuy
{
public:
class Bomb : public BadGuy
{
public:
- Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_
cherry/cherry
.sprite" );
+ Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_
bomb/bomb
.sprite" );
Bomb(const Bomb& bomb);
void write(lisp::Writer& writer);
Bomb(const Bomb& bomb);
void write(lisp::Writer& writer);
@@
-38,14
+38,12
@@
public:
private:
enum State {
private:
enum State {
- STATE_TICKING,
- STATE_EXPLODING
+ STATE_TICKING
};
};
-
+
State state;
std::auto_ptr<SoundSource> ticking;
};
#endif
State state;
std::auto_ptr<SoundSource> ticking;
};
#endif
-