projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use run_dead_script wherever possible and make kill_* operations only do stuff once
[supertux.git]
/
src
/
badguy
/
mole_rock.cpp
diff --git
a/src/badguy/mole_rock.cpp
b/src/badguy/mole_rock.cpp
index
14529c9
..
1c05ef0
100644
(file)
--- a/
src/badguy/mole_rock.cpp
+++ b/
src/badguy/mole_rock.cpp
@@
-22,28
+22,33
@@
#include "mole_rock.hpp"
#include "mole_rock.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "audio/sound_manager.hpp"
+#include "sprite/sprite.hpp"
+
MoleRock::MoleRock(const lisp::Lisp& reader)
MoleRock::MoleRock(const lisp::Lisp& reader)
- : BadGuy(reader, "images/creatures/mole/mole_rock.sprite", LAYER_TILES - 2), parent(0), initial_velocity(Vector(0, -400))
+
: BadGuy(reader, "images/creatures/mole/mole_rock.sprite", LAYER_TILES - 2), parent(0), initial_velocity(Vector(0, -400))
{
physic.enable_gravity(true);
countMe = false;
{
physic.enable_gravity(true);
countMe = false;
- sound_manager->preload("sounds/
fall
.wav");
+ sound_manager->preload("sounds/
darthit
.wav");
sound_manager->preload("sounds/stomp.wav");
}
MoleRock::MoleRock(const Vector& pos, const Vector& velocity, const BadGuy* parent = 0)
sound_manager->preload("sounds/stomp.wav");
}
MoleRock::MoleRock(const Vector& pos, const Vector& velocity, const BadGuy* parent = 0)
- : BadGuy(pos, LEFT, "images/creatures/mole/mole_rock.sprite", LAYER_TILES - 2), parent(parent), initial_velocity(velocity)
+
: BadGuy(pos, LEFT, "images/creatures/mole/mole_rock.sprite", LAYER_TILES - 2), parent(parent), initial_velocity(velocity)
{
physic.enable_gravity(true);
countMe = false;
{
physic.enable_gravity(true);
countMe = false;
- sound_manager->preload("sounds/
fall
.wav");
+ sound_manager->preload("sounds/
darthit
.wav");
sound_manager->preload("sounds/stomp.wav");
}
MoleRock::MoleRock(const MoleRock& other)
sound_manager->preload("sounds/stomp.wav");
}
MoleRock::MoleRock(const MoleRock& other)
- : BadGuy(other), parent(other.parent), initial_velocity(Vector(0, -400))
+
: BadGuy(other), parent(other.parent), initial_velocity(Vector(0, -400))
{
{
- sound_manager->preload("sounds/
fall
.wav");
+ sound_manager->preload("sounds/
darthit
.wav");
sound_manager->preload("sounds/stomp.wav");
}
sound_manager->preload("sounds/stomp.wav");
}
@@
-65,8
+70,8
@@
void
MoleRock::write(lisp::Writer& writer)
{
writer.start_list("mole_rock");
MoleRock::write(lisp::Writer& writer)
{
writer.start_list("mole_rock");
- writer.write
_float
("x", start_position.x);
- writer.write
_float
("y", start_position.y);
+ writer.write("x", start_position.x);
+ writer.write("y", start_position.y);
writer.end_list("mole_rock");
}
writer.end_list("mole_rock");
}