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

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

diff --git a/src/object/block.hpp b/src/object/block.hpp
index 4f326eb..fd06c2c 100644 (file)
--- a/src/object/block.hpp
+++ b/src/object/block.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.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,14 +12,15 @@
 //  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/>.
+
+#ifndef HEADER_SUPERTUX_OBJECT_BLOCK_HPP
+#define HEADER_SUPERTUX_OBJECT_BLOCK_HPP
 
-#ifndef __BLOCK_H__
-#define __BLOCK_H__
+#include <memory>
 
-#include "moving_object.hpp"
-#include "lisp/lisp.hpp"
+#include "supertux/moving_object.hpp"
+#include "util/reader_fwd.hpp"
 
 class Sprite;
 class Player;
@@ -29,7 +28,7 @@ class Player;
 class Block : public MovingObject
 {
 public:
-  Block(Sprite* sprite = 0);
+  Block(std::auto_ptr<Sprite> sprite);
   ~Block();
 
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
@@ -44,20 +43,23 @@ protected:
   void start_break(GameObject* hitter);
   void break_me();
 
-  Sprite* sprite;
+  std::auto_ptr<Sprite> sprite;
   bool bouncing;
   bool breaking;
   float bounce_dir;
   float bounce_offset;
   float original_y;
 
+private:
+  Block(const Block&);
+  Block& operator=(const Block&);
 };
 
 class BonusBlock : public Block
 {
 public:
   BonusBlock(const Vector& pos, int data);
-  BonusBlock(const lisp::Lisp& lisp);
+  BonusBlock(const Reader& lisp);
   virtual ~BonusBlock();
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
@@ -97,3 +99,5 @@ private:
 };
 
 #endif
+
+/* EOF */