New sound effects

[supertux.git] / src / badguy / dart.cpp

diff --git a/src/badguy/dart.cpp b/src/badguy/dart.cpp
index 10f8ea1..37389fc 100644 (file)
--- a/src/badguy/dart.cpp
+++ b/src/badguy/dart.cpp
@@ -22,33 +22,33 @@
 #include "supertux/object_factory.hpp"
 
 namespace {
-const float SPEED = 200;
+const float DART_SPEED = 200;
 }
 
-static const std::string SOUNDFILE = "sounds/flame.wav";
+static const std::string DART_SOUND = "sounds/flame.wav";
 
 Dart::Dart(const Reader& reader) :
-  BadGuy(reader, "images/creatures/dart/dart.sprite"), 
+  BadGuy(reader, "images/creatures/dart/dart.sprite"),
   parent(0),
   sound_source()
 {
   physic.enable_gravity(false);
   countMe = false;
-  sound_manager->preload(SOUNDFILE);
-  sound_manager->preload("sounds/darthit.wav");
-  sound_manager->preload("sounds/stomp.wav");
+  SoundManager::current()->preload(DART_SOUND);
+  SoundManager::current()->preload("sounds/darthit.wav");
+  SoundManager::current()->preload("sounds/stomp.wav");
 }
 
-Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent = 0) :
-  BadGuy(pos, d, "images/creatures/dart/dart.sprite"), 
-  parent(parent),
+Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent_ = 0) :
+  BadGuy(pos, d, "images/creatures/dart/dart.sprite"),
+  parent(parent_),
   sound_source()
 {
   physic.enable_gravity(false);
   countMe = false;
-  sound_manager->preload(SOUNDFILE);
-  sound_manager->preload("sounds/darthit.wav");
-  sound_manager->preload("sounds/stomp.wav");
+  SoundManager::current()->preload(DART_SOUND);
+  SoundManager::current()->preload("sounds/darthit.wav");
+  SoundManager::current()->preload("sounds/stomp.wav");
 }
 
 Dart::~Dart()
@@ -68,14 +68,14 @@ Dart::updatePointers(const GameObject* from_object, GameObject* to_object)
 void
 Dart::initialize()
 {
-  physic.set_velocity_x(dir == LEFT ? -::SPEED : ::SPEED);
+  physic.set_velocity_x(dir == LEFT ? -::DART_SPEED : ::DART_SPEED);
   sprite->set_action(dir == LEFT ? "flying-left" : "flying-right");
 }
 
 void
 Dart::activate()
 {
-  sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
+  sound_source = SoundManager::current()->create_sound_source(DART_SOUND);
   sound_source->set_position(get_pos());
   sound_source->set_looping(true);
   sound_source->set_gain(1.0);
@@ -100,7 +100,7 @@ Dart::active_update(float elapsed_time)
 void
 Dart::collision_solid(const CollisionHit& )
 {
-  sound_manager->play("sounds/darthit.wav", get_pos());
+  SoundManager::current()->play("sounds/darthit.wav", get_pos());
   remove_me();
 }
 
@@ -111,7 +111,7 @@ Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
   if (&badguy == parent) {
     return FORCE_MOVE;
   }
-  sound_manager->play("sounds/stomp.wav", get_pos());
+  SoundManager::current()->play("sounds/stomp.wav", get_pos());
   remove_me();
   badguy.kill_fall();
   return ABORT_MOVE;
@@ -120,7 +120,7 @@ Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
 HitResponse
 Dart::collision_player(Player& player, const CollisionHit& hit)
 {
-  sound_manager->play("sounds/stomp.wav", get_pos());
+  SoundManager::current()->play("sounds/stomp.wav", get_pos());
   remove_me();
   return BadGuy::collision_player(player, hit);
 }