bonusblock can now contain custom MovingObjects, added possibility to execute script...

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

diff --git a/src/object/block.h b/src/object/block.h
index bd750a0..a6f9df1 100644 (file)
--- a/src/object/block.h
+++ b/src/object/block.h
@@ -1,27 +1,43 @@
-#ifndef __BOX_H__
-#define __BOX_H__
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  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 __BLOCK_H__
+#define __BLOCK_H__
 
-#include "special/moving_object.h"
+#include "moving_object.h"
+#include "lisp/lisp.h"
 
-namespace SuperTux {
-  class Sprite;
-}
+class Sprite;
 class Player;
 
-using namespace SuperTux;
-
 class Block : public MovingObject
 {
 public:
-  Block(const Vector& pos, Sprite* sprite);
+  Block(Sprite* sprite = 0);
   ~Block();
 
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
-  virtual void action(float elapsed_time);
+  virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
 
 protected:
-  virtual void hit(Player* player) = 0;
+  virtual void hit(Player& player) = 0;
   void start_bounce();
 
   Sprite* sprite;
@@ -35,12 +51,26 @@ class BonusBlock : public Block
 {
 public:
   BonusBlock(const Vector& pos, int data);
+  BonusBlock(const lisp::Lisp& lisp);
+  virtual ~BonusBlock();
+
+  void try_open();
 
 protected:
-  virtual void hit(Player* player);
+  virtual void hit(Player& player);
 
 private:
-  int data;
+  enum Contents {
+    CONTENT_COIN,
+    CONTENT_FIREGROW,
+    CONTENT_ICEGROW,
+    CONTENT_STAR,
+    CONTENT_1UP,
+    CONTENT_CUSTOM
+  };
+
+  Contents contents;
+  MovingObject* object;
 };
 
 class Brick : public Block
@@ -48,8 +78,10 @@ class Brick : public Block
 public:
   Brick(const Vector& pos, int data);
 
+  void try_break(bool playerhit = false);
+
 protected:
-  virtual void hit(Player* player);
+  virtual void hit(Player& player);
 
 private:
   bool breakable;