X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fwalking_badguy.hpp;h=038d87668f6ebd8840fa298c5c60bca9314595e7;hb=4a7c81e8b976522a88dc2e9ec8a40340c603d7ff;hp=313a5293736d08bca787113dcaf18ffe3787fe2d;hpb=89ecbfcacb9abac599f8feba52792392b8199cf1;p=supertux.git

diff --git a/src/badguy/walking_badguy.hpp b/src/badguy/walking_badguy.hpp
index 313a52937..038d87668 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,39 +12,71 @@
 //  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 HEADER_SUPERTUX_BADGUY_WALKING_BADGUY_HPP
+#define HEADER_SUPERTUX_BADGUY_WALKING_BADGUY_HPP
 
-#ifndef __WALKING_BADGUY_H__
-#define __WALKING_BADGUY_H__
+#include "badguy/badguy.hpp"
 
-#include "badguy.hpp"
+class Timer;
 
 /**
- * Baseclass for a Badguy that just walks around.
+ * Base class for Badguys that walk on the floor.
  */
 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();
   void unfreeze();
 
+  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;
   int max_drop_height; /**< Maximum height of drop before we will turn around, or -1 to just drop from any ledge */
+  Timer turn_around_timer;
+  int turn_around_counter; /**< counts number of turns since turn_around_timer was started */
 };
 
 #endif
+
+/* EOF */