Applied sound pre-loading patch from mathnerd314 (#331)

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

diff --git a/src/badguy/dart.cpp b/src/badguy/dart.cpp
index 4726a01..f952492 100644 (file)
--- a/src/badguy/dart.cpp
+++ b/src/badguy/dart.cpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
 //  Dart - Your average poison dart
-//  Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
+//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -31,8 +31,9 @@ static const std::string SOUNDFILE = "sounds/flame.wav";
 Dart::Dart(const lisp::Lisp& reader)
        : BadGuy(reader, "images/creatures/dart/dart.sprite"), parent(0)
 {
-  physic.gravity_enabled = false;
+  physic.enable_gravity(false);
   countMe = false;
+  sound_manager->preload(SOUNDFILE);
   sound_manager->preload("sounds/darthit.wav");
   sound_manager->preload("sounds/stomp.wav");
 }
@@ -40,8 +41,9 @@ Dart::Dart(const lisp::Lisp& reader)
 Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent = 0)
        : BadGuy(pos, d, "images/creatures/dart/dart.sprite"), parent(parent)
 {
-  physic.gravity_enabled = false;
+  physic.enable_gravity(false);
   countMe = false;
+  sound_manager->preload(SOUNDFILE);
   sound_manager->preload("sounds/darthit.wav");
   sound_manager->preload("sounds/stomp.wav");
 }
@@ -49,7 +51,7 @@ Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent = 0)
 Dart::Dart(const Dart& other)
        : BadGuy(other), parent(other.parent)
 {
-  sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
+  sound_manager->preload(SOUNDFILE);
   sound_manager->preload("sounds/darthit.wav");
   sound_manager->preload("sounds/stomp.wav");
 }
@@ -78,11 +80,15 @@ Dart::write(lisp::Writer& writer)
 }
 
 void
-Dart::activate()
+Dart::initialize()
 {
-  physic.vx = (dir == LEFT ? -::SPEED : ::SPEED);
+  physic.set_velocity_x(dir == LEFT ? -::SPEED : ::SPEED);
   sprite->set_action(dir == LEFT ? "flying-left" : "flying-right");
+}
 
+void
+Dart::activate()
+{
   sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
   sound_source->set_position(get_pos());
   sound_source->set_looping(true);