More -Weffc++ cleanup

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

diff --git a/src/object/block.hpp b/src/object/block.hpp
index c00cce7..d31ba4d 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);
@@ -40,30 +39,32 @@ protected:
   friend class FlipLevelTransformer;
 
   virtual void hit(Player& player) = 0;
-  void start_bounce();
+  void start_bounce(GameObject* hitter);
+  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);
 
   void try_open();
 
-protected:
-  virtual void hit(Player& player);
-
-private:
   enum Contents {
     CONTENT_COIN,
     CONTENT_FIREGROW,
@@ -73,8 +74,16 @@ private:
     CONTENT_CUSTOM
   };
 
+protected:
+  virtual void hit(Player& player);
+
+public:
   Contents contents;
   MovingObject* object;
+
+private:
+  BonusBlock(const BonusBlock&);
+  BonusBlock& operator=(const BonusBlock&);
 };
 
 class Brick : public Block
@@ -82,7 +91,7 @@ class Brick : public Block
 public:
   Brick(const Vector& pos, int data);
 
-  void try_break(bool playerhit = false);
+  void try_break(Player* player = false);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
 protected:
@@ -94,3 +103,5 @@ private:
 };
 
 #endif
+
+/* EOF */