projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Addon include fixes.
[supertux.git]
/
src
/
badguy
/
mole.cpp
diff --git
a/src/badguy/mole.cpp
b/src/badguy/mole.cpp
index
32a86e5
..
7f1bb7e
100644
(file)
--- a/
src/badguy/mole.cpp
+++ b/
src/badguy/mole.cpp
@@
-33,21
+33,21
@@
static const float THROW_INTERVAL = 1; /**< time between two thrown rocks */
static const float THROW_VELOCITY = 400; /**< initial velocity of thrown rocks */
Mole::Mole(const lisp::Lisp& reader)
static const float THROW_VELOCITY = 400; /**< initial velocity of thrown rocks */
Mole::Mole(const lisp::Lisp& reader)
-
: BadGuy(reader, "images/creatures/mole/mole.sprite", LAYER_TILES-1), state(PRE_THROWING)
+ : BadGuy(reader, "images/creatures/mole/mole.sprite", LAYER_TILES-1), state(PRE_THROWING)
{
physic.enable_gravity(false);
sound_manager->preload("sounds/fall.wav");
sound_manager->preload("sounds/squish.wav");
{
physic.enable_gravity(false);
sound_manager->preload("sounds/fall.wav");
sound_manager->preload("sounds/squish.wav");
- sound_manager->preload("sounds/dartfire.wav";
+ sound_manager->preload("sounds/dartfire.wav"
)
;
}
Mole::Mole(const Vector& pos)
}
Mole::Mole(const Vector& pos)
-
: BadGuy(pos, "images/creatures/mole/mole.sprite", LAYER_TILES-1), state(PRE_THROWING)
+ : BadGuy(pos, "images/creatures/mole/mole.sprite", LAYER_TILES-1), state(PRE_THROWING)
{
physic.enable_gravity(false);
sound_manager->preload("sounds/fall.wav");
sound_manager->preload("sounds/squish.wav");
{
physic.enable_gravity(false);
sound_manager->preload("sounds/fall.wav");
sound_manager->preload("sounds/squish.wav");
- sound_manager->preload("sounds/dartfire.wav";
+ sound_manager->preload("sounds/dartfire.wav"
)
;
}
void
}
void
@@
-110,26
+110,26
@@
Mole::active_update(float elapsed_time)
switch (state) {
case PRE_THROWING:
if (timer.check()) {
switch (state) {
case PRE_THROWING:
if (timer.check()) {
- set_state(THROWING);
+
set_state(THROWING);
}
break;
case THROWING:
if (throw_timer.check()) {
throw_rock();
}
break;
case THROWING:
if (throw_timer.check()) {
throw_rock();
- throw_timer.start(THROW_INTERVAL);
+
throw_timer.start(THROW_INTERVAL);
}
if (timer.check()) {
}
if (timer.check()) {
- set_state(POST_THROWING);
+
set_state(POST_THROWING);
}
break;
case POST_THROWING:
if (timer.check()) {
}
break;
case POST_THROWING:
if (timer.check()) {
- set_state(PEEKING);
+
set_state(PEEKING);
}
break;
case PEEKING:
if (sprite->animation_done()) {
}
break;
case PEEKING:
if (sprite->animation_done()) {
- set_state(PRE_THROWING);
+
set_state(PRE_THROWING);
}
break;
case DEAD:
}
break;
case DEAD: