Reverted bigger parts of tuxdev patch:

[supertux.git] / src / badguy / rocketexplosion.hpp

diff --git a/src/badguy/rocketexplosion.hpp b/src/badguy/rocketexplosion.hpp
index c76a6b8..e334dc8 100644 (file)
--- a/src/badguy/rocketexplosion.hpp
+++ b/src/badguy/rocketexplosion.hpp
@@ -17,8 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef __BOMB_H__
-#define __BOMB_H__
+#ifndef __ROCKETEXPLOSION_H__
+#define __ROCKETEXPLOSION_H__
 
 #include "badguy.hpp"
 
@@ -28,7 +28,6 @@ public:
   RocketExplosion(const Vector& pos, Direction dir);
 
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);
@@ -42,4 +41,3 @@ private:
 };
 
 #endif
-