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

[supertux.git] / src / object / sprite_particle.hpp

diff --git a/src/object/sprite_particle.hpp b/src/object/sprite_particle.hpp
index dba9caa..85e7f9f 100644 (file)
--- a/src/object/sprite_particle.hpp
+++ b/src/object/sprite_particle.hpp
@@ -1,13 +1,11 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.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
@@ -15,20 +13,16 @@
 //  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.
-
-#ifndef __SPRITE_PARTICLE_H__
-#define __SPRITE_PARTICLE_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#ifndef HEADER_SUPERTUX_OBJECT_SPRITE_PARTICLE_HPP
+#define HEADER_SUPERTUX_OBJECT_SPRITE_PARTICLE_HPP
 
-#include "game_object.hpp"
-#include "resources.hpp"
-#include "player.hpp"
 #include "object/anchor_point.hpp"
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
-#include "video/drawing_context.hpp"
+
+class Player;
 
 class SpriteParticle : public GameObject
 {
@@ -39,12 +33,19 @@ protected:
   virtual void hit(Player& player);
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
+
 private:
-  Sprite* sprite;
+  std::auto_ptr<Sprite> sprite;
   Vector position;
   Vector velocity;
   Vector acceleration;
   int drawing_layer;
+
+private:
+  SpriteParticle(const SpriteParticle&);
+  SpriteParticle& operator=(const SpriteParticle&);
 };
 
 #endif
+
+/* EOF */