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

[supertux.git] / src / object / moving_sprite.cpp

diff --git a/src/object/moving_sprite.cpp b/src/object/moving_sprite.cpp
index 9e5d855..a737109 100644 (file)
--- a/src/object/moving_sprite.cpp
+++ b/src/object/moving_sprite.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - MovingSprite Base Class
 //  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,21 +12,14 @@
 //  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.
-#include <config.h>
-
-#include <stdexcept>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "moving_sprite.hpp"
-#include "video/drawing_context.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "sector.hpp"
-#include "object_factory.hpp"
+#include "object/moving_sprite.hpp"
 #include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
 
 MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, int layer, CollisionGroup collision_group)
-        : sprite_name(sprite_name), layer(layer)
+  : sprite_name(sprite_name), layer(layer)
 {
   bbox.set_pos(pos);
   sprite = sprite_manager->create(sprite_name);
@@ -36,8 +27,8 @@ MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, in
   set_group(collision_group);
 }
 
-MovingSprite::MovingSprite(const lisp::Lisp& reader, const Vector& pos, int layer, CollisionGroup collision_group)
-        : layer(layer)
+MovingSprite::MovingSprite(const Reader& reader, const Vector& pos, int layer, CollisionGroup collision_group)
+  : layer(layer)
 {
   bbox.set_pos(pos);
   if (!reader.get("sprite", sprite_name))
@@ -48,8 +39,8 @@ MovingSprite::MovingSprite(const lisp::Lisp& reader, const Vector& pos, int laye
   set_group(collision_group);
 }
 
-MovingSprite::MovingSprite(const lisp::Lisp& reader, const std::string& sprite_name, int layer, CollisionGroup collision_group)
-        : sprite_name(sprite_name), layer(layer)
+MovingSprite::MovingSprite(const Reader& reader, const std::string& sprite_name, int layer, CollisionGroup collision_group)
+  : sprite_name(sprite_name), layer(layer)
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
@@ -60,8 +51,8 @@ MovingSprite::MovingSprite(const lisp::Lisp& reader, const std::string& sprite_n
   set_group(collision_group);
 }
 
-MovingSprite::MovingSprite(const lisp::Lisp& reader, int layer, CollisionGroup collision_group)
-        : layer(layer)
+MovingSprite::MovingSprite(const Reader& reader, int layer, CollisionGroup collision_group)
+  : layer(layer)
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
@@ -73,17 +64,18 @@ MovingSprite::MovingSprite(const lisp::Lisp& reader, int layer, CollisionGroup c
   set_group(collision_group);
 }
 
-MovingSprite::MovingSprite(const MovingSprite& other)
-        : MovingObject(other), layer(other.layer)
+MovingSprite::MovingSprite(const MovingSprite& other) :
+  MovingObject(other), 
+  layer(other.layer)
 {
-  sprite = new Sprite(*other.sprite);
+  sprite.reset(new Sprite(*other.sprite));
 }
-
-MovingSprite&
-MovingSprite::operator=(const MovingSprite& other)
-{
+/*
+  MovingSprite&
+  MovingSprite::operator=(const MovingSprite& other)
+  {
   if (this == &other)
-    return *this;
+  return *this;
 
   delete sprite;
   sprite = new Sprite(*other.sprite);
@@ -91,11 +83,10 @@ MovingSprite::operator=(const MovingSprite& other)
   layer = other.layer;
 
   return *this;
-}
-
+  }
+*/
 MovingSprite::~MovingSprite()
 {
-  delete sprite;
 }
 
 void
@@ -135,3 +126,5 @@ MovingSprite::set_action(const std::string& action, int loops, AnchorPoint ancho
   set_size(w, h);
   set_pos(get_anchor_pos(old_bbox, w, h, anchorPoint));
 }
+
+/* EOF */