X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.hpp;h=28ef8dba761301d61d5511371f9efe408d5ba230;hb=b91dbe6bc1d5047a127cdc688dda836c59e8c2d1;hp=c9fa3fca3126df4c6583c3093881aac216c0e4b0;hpb=16262ff3cac7fdd1de8dc46a967f93cce902ed7f;p=supertux.git

diff --git a/src/badguy/flyingsnowball.hpp b/src/badguy/flyingsnowball.hpp
index c9fa3fca3..28ef8dba7 100644
--- a/src/badguy/flyingsnowball.hpp
+++ b/src/badguy/flyingsnowball.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  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 3 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
@@ -14,35 +12,31 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __FLYINGSNOWBALL_H__
-#define __FLYINGSNOWBALL_H__
+#ifndef HEADER_SUPERTUX_BADGUY_FLYINGSNOWBALL_HPP
+#define HEADER_SUPERTUX_BADGUY_FLYINGSNOWBALL_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class FlyingSnowBall : public BadGuy
 {
 public:
-  FlyingSnowBall(const lisp::Lisp& reader);
-  FlyingSnowBall(float pos_x, float pos_y);
+  FlyingSnowBall(const Reader& reader);
+  FlyingSnowBall(const Vector& pos);
 
+  void initialize();
   void activate();
-  void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
+
 protected:
-  enum FlyingSnowballMode {
-    FLY_UP,
-    FLY_DOWN
-  };
-  FlyingSnowballMode mode;
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
 private:
-  Timer timer;
+  float normal_propeller_speed;
   Timer puff_timer; /**< time until the next smoke puff is spawned */
 };
 
 #endif
 
+/* EOF */