X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmole_rock.cpp;h=1c05ef0d2f282714386bc32f4ab769f15ea3a6ac;hb=2ad3ecbc14b77d373c796ad04d6389489666cc01;hp=c9252ff051c64a7df5163e0fc166c196cf20a0b9;hpb=aa4d915cb7b05dec5722c4ad88141d4c4f9599ea;p=supertux.git diff --git a/src/badguy/mole_rock.cpp b/src/badguy/mole_rock.cpp index c9252ff05..1c05ef0d2 100644 --- a/src/badguy/mole_rock.cpp +++ b/src/badguy/mole_rock.cpp @@ -22,23 +22,34 @@ #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) - : 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; + sound_manager->preload("sounds/darthit.wav"); + 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; + sound_manager->preload("sounds/darthit.wav"); + 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/darthit.wav"); + sound_manager->preload("sounds/stomp.wav"); } MoleRock::~MoleRock() @@ -59,13 +70,13 @@ void 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"); } void -MoleRock::activate() +MoleRock::initialize() { physic.set_velocity(initial_velocity); sprite->set_action("default");