X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fwalking_badguy.hpp;h=26c2f47b2575ce160f44b05d90614273928eeb89;hb=77b5a67fccb8ce3a5ba43280105031a46560a5c8;hp=3200cb7085adfceade10993bc89f07c6d0465077;hpb=8b67b0dc71efddc4b668bde525ba94d701f622ac;p=supertux.git

diff --git a/src/badguy/walking_badguy.hpp b/src/badguy/walking_badguy.hpp
index 3200cb708..26c2f47b2 100644
--- 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,13 +27,25 @@ 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 activate();
-  void write(lisp::Writer& writer);
+  void initialize();
   void active_update(float elapsed_time);
+  void active_update(float elapsed_time, float target_velocity);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void freeze();
@@ -45,9 +54,21 @@ public:
   float get_velocity_y() const;
   void set_velocity_y(float vy);
 
+  /**
+   * Adds velocity to the badguy (be careful when using this)
+   */
+  void add_velocity(const Vector& velocity);
+
+  float get_walk_speed (void) const
+  {
+    return (walk_speed);
+  }
+  void  set_walk_speed (float);
+
 protected:
   void turn_around();
 
+protected:
   std::string walk_left_action;
   std::string walk_right_action;
   float walk_speed;
@@ -57,3 +78,5 @@ protected:
 };
 
 #endif
+
+/* EOF */