X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fwalking_badguy.hpp;h=26c2f47b2575ce160f44b05d90614273928eeb89;hb=77b5a67fccb8ce3a5ba43280105031a46560a5c8;hp=f3160783326403f3619b9d5e8aee3c4cf7432520;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git diff --git a/src/badguy/walking_badguy.hpp b/src/badguy/walking_badguy.hpp index f31607833..26c2f47b2 100644 --- a/src/badguy/walking_badguy.hpp +++ b/src/badguy/walking_badguy.hpp @@ -27,24 +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, + 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, + 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, + 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 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(); @@ -53,6 +54,17 @@ 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();