X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fblock.hpp;h=767a414f2421a90588ead8b00a6be040ab7d90df;hb=575ee7830c331b48172dccacc7a96188f8d6695b;hp=c00cce7870f353cc1bae44f7dba30e996cdb33f0;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/object/block.hpp b/src/object/block.hpp
index c00cce787..767a414f2 100644
--- 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,22 +12,23 @@
 //  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 "sprite/sprite_ptr.hpp"
+#include "supertux/moving_object.hpp"
+#include "util/reader_fwd.hpp"
 
-class Sprite;
 class Player;
 
 class Block : public MovingObject
 {
 public:
-  Block(Sprite* sprite = 0);
+  Block(SpritePtr sprite);
   ~Block();
 
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
@@ -40,57 +39,22 @@ 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;
+  SpritePtr sprite;
   bool bouncing;
+  bool breaking;
   float bounce_dir;
   float bounce_offset;
   float original_y;
 
-};
-
-class BonusBlock : public Block
-{
-public:
-  BonusBlock(const Vector& pos, int data);
-  BonusBlock(const lisp::Lisp& 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,
-    CONTENT_ICEGROW,
-    CONTENT_STAR,
-    CONTENT_1UP,
-    CONTENT_CUSTOM
-  };
-
-  Contents contents;
-  MovingObject* object;
-};
-
-class Brick : public Block
-{
-public:
-  Brick(const Vector& pos, int data);
-
-  void try_break(bool playerhit = false);
-  HitResponse collision(GameObject& other, const CollisionHit& hit);
-
-protected:
-  virtual void hit(Player& player);
-
-private:
-  bool breakable;
-  int coin_counter;
+  Block(const Block&);
+  Block& operator=(const Block&);
 };
 
 #endif
+
+/* EOF */