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

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

diff --git a/src/badguy/walking_badguy.hpp b/src/badguy/walking_badguy.hpp
index f5a7eb6..f316078 100644 (file)
--- a/src/badguy/walking_badguy.hpp
+++ b/src/badguy/walking_badguy.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - WalkingBadguy
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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,13 +12,12 @@
 //  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 __WALKING_BADGUY_H__
-#define __WALKING_BADGUY_H__
+#ifndef HEADER_SUPERTUX_BADGUY_WALKING_BADGUY_HPP
+#define HEADER_SUPERTUX_BADGUY_WALKING_BADGUY_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class Timer;
 
@@ -30,12 +27,23 @@ class Timer;
 class WalkingBadguy : public BadGuy
 {
 public:
-  WalkingBadguy(const Vector& pos, const std::string& sprite_name, const std::string& walk_left_action, const std::string& walk_right_action, int layer = LAYER_OBJECTS);
-  WalkingBadguy(const Vector& pos, Direction direction, const std::string& sprite_name, const std::string& walk_left_action, const std::string& walk_right_action, int layer = LAYER_OBJECTS);
-  WalkingBadguy(const lisp::Lisp& reader, const std::string& sprite_name, const std::string& walk_left_action, const std::string& walk_right_action, int layer = LAYER_OBJECTS);
+  WalkingBadguy(const Vector& pos, 
+                const std::string& sprite_name, 
+                const std::string& walk_left_action, 
+                const std::string& walk_right_action, 
+                int layer = LAYER_OBJECTS);
+  WalkingBadguy(const Vector& pos, Direction direction, 
+                const std::string& sprite_name, 
+                const std::string& walk_left_action, 
+                const std::string& walk_right_action, 
+                int layer = LAYER_OBJECTS);
+  WalkingBadguy(const Reader& reader, 
+                const std::string& sprite_name, 
+                const std::string& walk_left_action, 
+                const std::string& walk_right_action, 
+                int layer = LAYER_OBJECTS);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
@@ -48,6 +56,7 @@ public:
 protected:
   void turn_around();
 
+protected:
   std::string walk_left_action;
   std::string walk_right_action;
   float walk_speed;
@@ -57,3 +66,5 @@ protected:
 };
 
 #endif
+
+/* EOF */