converted ghost forest music to .ogg because of problems playing the mod file

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

diff --git a/src/object/block.h b/src/object/block.h
index 43321f1..a6f9df1 100644 (file)
--- a/src/object/block.h
+++ b/src/object/block.h
@@ -33,7 +33,7 @@ public:
   ~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:
@@ -52,6 +52,7 @@ class BonusBlock : public Block
 public:
   BonusBlock(const Vector& pos, int data);
   BonusBlock(const lisp::Lisp& lisp);
+  virtual ~BonusBlock();
 
   void try_open();
 
@@ -64,10 +65,12 @@ private:
     CONTENT_FIREGROW,
     CONTENT_ICEGROW,
     CONTENT_STAR,
-    CONTENT_1UP
+    CONTENT_1UP,
+    CONTENT_CUSTOM
   };
 
   Contents contents;
+  MovingObject* object;
 };
 
 class Brick : public Block