Rolled file back to version from master, due to improper merge

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

diff --git a/src/object/bonus_block.hpp b/src/object/bonus_block.hpp
index f993785..471313a 100644 (file)
--- a/src/object/bonus_block.hpp
+++ b/src/object/bonus_block.hpp
@@ -29,6 +29,7 @@ public:
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
   void try_open(Player *player);
+  void try_drop(Player *player);
 
   enum Contents {
     CONTENT_COIN,
@@ -38,7 +39,10 @@ public:
     CONTENT_1UP,
     CONTENT_CUSTOM,
     CONTENT_SCRIPT,
-    CONTENT_LIGHT
+    CONTENT_LIGHT,
+    CONTENT_TRAMPOLINE,
+    CONTENT_RAIN,
+    CONTENT_EXPLODE
   };
 
 protected: