Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/badguy/dart.cpp b/src/badguy/dart.cpp
index 393474e..1bba323 100644 (file)
--- a/src/badguy/dart.cpp
+++ b/src/badguy/dart.cpp
@@ -1,12 +1,10 @@
-//  $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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,42 +12,41 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include "badguy/dart.hpp"
 
-#include "dart.hpp"
+#include "audio/sound_manager.hpp"
+#include "audio/sound_source.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
 namespace {
-  const float SPEED = 200;
+const float SPEED = 200;
 }
 
 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 Reader& reader) :
+  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");
 }
 
-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("sounds/darthit.wav");
-  sound_manager->preload("sounds/stomp.wav");
-}
-
-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");
 }
@@ -69,20 +66,15 @@ Dart::updatePointers(const GameObject* from_object, GameObject* to_object)
 }
 
 void
-Dart::write(lisp::Writer& writer)
+Dart::initialize()
 {
-  writer.start_list("dart");
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-  writer.end_list("dart");
+  physic.set_velocity_x(dir == LEFT ? -::SPEED : ::SPEED);
+  sprite->set_action(dir == LEFT ? "flying-left" : "flying-right");
 }
 
 void
 Dart::activate()
 {
-  physic.set_velocity_x(dir == LEFT ? -::SPEED : ::SPEED);
-  sprite->set_action(dir == LEFT ? "flying-left" : "flying-right");
-
   sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
   sound_source->set_position(get_pos());
   sound_source->set_looping(true);
@@ -133,4 +125,6 @@ Dart::collision_player(Player& player, const CollisionHit& hit)
   return BadGuy::collision_player(player, hit);
 }
 
-IMPLEMENT_FACTORY(Dart, "dart")
+IMPLEMENT_FACTORY(Dart, "dart");
+
+/* EOF */