X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fdarttrap.cpp;h=9bb2eaa3a58165c9d94f14a2afb2686cb3fb4d2e;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=abada3ba3a5440333a5965593520c3b66ef1e6c2;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git diff --git a/src/badguy/darttrap.cpp b/src/badguy/darttrap.cpp index abada3ba3..9bb2eaa3a 100644 --- a/src/badguy/darttrap.cpp +++ b/src/badguy/darttrap.cpp @@ -26,7 +26,7 @@ namespace { const float MUZZLE_Y = 28; /**< [px] muzzle y-offset from top */ } -DartTrap::DartTrap(const lisp::Lisp& reader) +DartTrap::DartTrap(const lisp::Lisp& reader) : BadGuy(reader, "images/creatures/darttrap/darttrap.sprite", LAYER_TILES-1), initial_delay(0), fire_delay(2), ammo(-1), state(IDLE) { reader.get("initial-delay", initial_delay); @@ -60,7 +60,7 @@ DartTrap::activate() fire_timer.start(initial_delay); } -HitResponse +HitResponse DartTrap::collision_player(Player& , const CollisionHit& ) { return ABORT_MOVE; @@ -105,4 +105,3 @@ DartTrap::fire() } IMPLEMENT_FACTORY(DartTrap, "darttrap") -