qmax patch to fix bug #0000389 - colors in infoblocks

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

diff --git a/src/badguy/dart.cpp b/src/badguy/dart.cpp
index cd251c8..bfed64a 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
@@ -28,28 +28,30 @@ namespace {
 
 static const std::string SOUNDFILE = "sounds/flame.wav";
 
-Dart::Dart(const lisp::Lisp& reader) 
-       : BadGuy(reader, "images/creatures/dart/dart.sprite"), parent(0)
+Dart::Dart(const lisp::Lisp& reader)
+        : BadGuy(reader, "images/creatures/dart/dart.sprite"), parent(0)
 {
   physic.enable_gravity(false);
   countMe = false;
+  sound_manager->preload(SOUNDFILE);
   sound_manager->preload("sounds/darthit.wav");
   sound_manager->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)
+        : BadGuy(pos, d, "images/creatures/dart/dart.sprite"), parent(parent)
 {
   physic.enable_gravity(false);
   countMe = false;
+  sound_manager->preload(SOUNDFILE);
   sound_manager->preload("sounds/darthit.wav");
   sound_manager->preload("sounds/stomp.wav");
 }
 
 Dart::Dart(const Dart& other)
-       : BadGuy(other), parent(other.parent)
+        : 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");
 }
@@ -58,7 +60,7 @@ Dart::~Dart()
 {
 }
 
-bool 
+bool
 Dart::updatePointers(const GameObject* from_object, GameObject* to_object)
 {
   if (from_object == parent) {
@@ -78,11 +80,15 @@ Dart::write(lisp::Writer& writer)
 }
 
 void
-Dart::activate()
-{ 
+Dart::initialize()
+{
   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);
@@ -93,28 +99,26 @@ Dart::activate()
 
 void
 Dart::deactivate()
-{  
+{
   sound_source.reset();
   remove_me();
 }
 
-void 
+void
 Dart::active_update(float elapsed_time)
 {
   BadGuy::active_update(elapsed_time);
   sound_source->set_position(get_pos());
 }
 
-
-HitResponse 
-Dart::collision_solid(GameObject& , const CollisionHit& )
+void
+Dart::collision_solid(const CollisionHit& )
 {
   sound_manager->play("sounds/darthit.wav", get_pos());
   remove_me();
-  return ABORT_MOVE;
 }
 
-HitResponse 
+HitResponse
 Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
 {
   // ignore collisions with parent
@@ -127,7 +131,7 @@ Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
   return ABORT_MOVE;
 }
 
-HitResponse 
+HitResponse
 Dart::collision_player(Player& player, const CollisionHit& hit)
 {
   sound_manager->play("sounds/stomp.wav", get_pos());
@@ -136,4 +140,3 @@ Dart::collision_player(Player& player, const CollisionHit& hit)
 }
 
 IMPLEMENT_FACTORY(Dart, "dart")
-