X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fspidermite.cpp;h=8ea7e74eb70040f595a06685567591adb76d1d29;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=70feda7698cf7a2f2d52b7678eb257e6ee76b1d8;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git diff --git a/src/badguy/spidermite.cpp b/src/badguy/spidermite.cpp index 70feda769..8ea7e74eb 100644 --- a/src/badguy/spidermite.cpp +++ b/src/badguy/spidermite.cpp @@ -22,8 +22,8 @@ #include "spidermite.hpp" -static const float FLYTIME = 1.2; -static const float FLYSPEED = -100.0; +static const float FLYTIME = 1.2f; +static const float FLYSPEED = -100.0f; SpiderMite::SpiderMite(const lisp::Lisp& reader) : BadGuy(reader, "images/creatures/spidermite/spidermite.sprite") @@ -48,8 +48,8 @@ SpiderMite::write(lisp::Writer& writer) writer.end_list("spidermite"); } -void -SpiderMite::activate() +void +SpiderMite::initialize() { sprite->set_action(dir == LEFT ? "left" : "right"); mode = FLY_UP; @@ -58,10 +58,10 @@ SpiderMite::activate() } bool -SpiderMite::collision_squished(Player& player) +SpiderMite::collision_squished(GameObject& object) { sprite->set_action(dir == LEFT ? "squished-left" : "squished-right"); - kill_squished(player); + kill_squished(object); return true; } @@ -74,7 +74,7 @@ SpiderMite::collision_solid(const CollisionHit& hit) } void -SpiderMite::active_update(float elapsed_time) +SpiderMite::active_update(float elapsed_time) { if(timer.check()) { if(mode == FLY_UP) {