Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/badguy/spidermite.hpp b/src/badguy/spidermite.hpp
index 2d3a036..c2e7675 100644 (file)
--- a/src/badguy/spidermite.hpp
+++ b/src/badguy/spidermite.hpp
@@ -1,48 +1,48 @@
-//  $Id: flyingsnowball.hpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
 //  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
-//  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
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __SPIDERMITE_H__
-#define __SPIDERMITE_H__
+#ifndef HEADER_SUPERTUX_BADGUY_SPIDERMITE_HPP
+#define HEADER_SUPERTUX_BADGUY_SPIDERMITE_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class SpiderMite : public BadGuy
 {
 public:
-  SpiderMite(const lisp::Lisp& reader);
-  SpiderMite(float pos_x, float pos_y);
+  SpiderMite(const Reader& reader);
+  SpiderMite(const Vector& pos);
 
-  void activate();
-  void write(lisp::Writer& writer);
+  void initialize();
   void active_update(float elapsed_time);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
+
 protected:
   enum SpiderMiteMode {
     FLY_UP,
     FLY_DOWN
   };
-  SpiderMiteMode mode;
-  bool collision_squished(Player& player);
+
+protected:
+  bool collision_squished(GameObject& object);
+
 private:
+  SpiderMiteMode mode;
   Timer timer;
 };
 
 #endif
 
+/* EOF */