X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.cpp;h=a0abf233a565c4bf1d78d4f659a15084e62874bc;hb=c655b296af60a436a8ce2bf0e6ede4f72eae0580;hp=517f6b90a0d942c7d789857709a541b6bbf7b244;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp index 517f6b90a..a0abf233a 100644 --- a/src/badguy/flyingsnowball.cpp +++ b/src/badguy/flyingsnowball.cpp @@ -25,13 +25,13 @@ #include "random_generator.hpp" #include "object/sprite_particle.hpp" -static const float FLYTIME = 1.0; -static const float FLYSPEED = -100.0; +static const float FLYTIME = 1.0f; +static const float FLYSPEED = -100.0f; namespace { - const float PUFF_PROBABILITY = 0.1; /**< chanche of puffs being spawned in the current cycle */ - const float PUFF_INTERVAL_MIN = 0.1; /**< spawn new puff of smoke at most that often */ - const float PUFF_INTERVAL_MAX = 1.1; /**< spawn new puff of smoke at least that often */ + const float PUFF_PROBABILITY = 0.1f; /**< chanche of puffs being spawned in the current cycle */ + const float PUFF_INTERVAL_MIN = 0.1f; /**< spawn new puff of smoke at most that often */ + const float PUFF_INTERVAL_MAX = 1.1f; /**< spawn new puff of smoke at least that often */ } FlyingSnowBall::FlyingSnowBall(const lisp::Lisp& reader) @@ -68,10 +68,10 @@ FlyingSnowBall::activate() } bool -FlyingSnowBall::collision_squished(Player& player) +FlyingSnowBall::collision_squished(GameObject& object) { sprite->set_action(dir == LEFT ? "squished-left" : "squished-right"); - kill_squished(player); + kill_squished(object); return true; }