fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/snowball.hpp b/src/badguy/snowball.hpp
index 5357490..a68bc3e 100644 (file)
--- a/src/badguy/snowball.hpp
+++ b/src/badguy/snowball.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,34 +12,28 @@
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __SNOWBALL_H__
 #define __SNOWBALL_H__
 
-#include "badguy.hpp"
+#include "walking_badguy.hpp"
 
-class SnowBall : public BadGuy
+class SnowBall : public WalkingBadguy
 {
 public:
   SnowBall(const lisp::Lisp& reader);
-  SnowBall(float pos_x, float pos_y, Direction d);
+  SnowBall(const Vector& pos, Direction d);
 
-  void activate();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
-  
+  virtual SnowBall* clone() const { return new SnowBall(*this); }
+
 protected:
   bool collision_squished(Player& player);
-  bool set_direction;
-  Direction initial_direction;  
-  bool fluffy;
+
 };
 
 #endif
-