X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fangrystone.cpp;h=34ea9c14f7a749fc131e8e5a299e1d9a8fbcf9a6;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=865e43061095fefd0f487ea5a3c9e6f5586ea228;hpb=3655d32f63f75b2af054ec68d4176e55a561ba96;p=supertux.git diff --git a/src/badguy/angrystone.cpp b/src/badguy/angrystone.cpp index 865e43061..34ea9c14f 100644 --- a/src/badguy/angrystone.cpp +++ b/src/badguy/angrystone.cpp @@ -1,7 +1,7 @@ // $Id$ // // AngryStone - A spiked block that charges towards the player -// Copyright (C) 2006 Christoph Sommer +// Copyright (C) 2006 Christoph Sommer // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -29,8 +29,12 @@ static const float ATTACK_TIME = 1; static const float RECOVER_TIME = .5; AngryStone::AngryStone(const lisp::Lisp& reader) - : BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), state(IDLE) + : BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), state(IDLE) { + physic.set_velocity_x(0); + physic.set_velocity_y(0); + physic.enable_gravity(true); + sprite->set_action("idle"); } void @@ -45,15 +49,6 @@ AngryStone::write(lisp::Writer& writer) } void -AngryStone::activate() -{ - physic.set_velocity_x(0); - physic.set_velocity_y(0); - physic.enable_gravity(true); - sprite->set_action("idle"); -} - -void AngryStone::collision_solid(const CollisionHit& hit) { // TODO