X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fangrystone.hpp;h=1a46e0c728b0efda138012706a5351b460217b09;hb=2d1bc69993923150eb701d3cacb917ab4e23d5ef;hp=13a5d2851b9797a67e5b600cfb12b881f1c485a2;hpb=e8f7edf76b317dd795fca90d64ef821eba07c142;p=supertux.git diff --git a/src/badguy/angrystone.hpp b/src/badguy/angrystone.hpp index 13a5d2851..1a46e0c72 100644 --- a/src/badguy/angrystone.hpp +++ b/src/badguy/angrystone.hpp @@ -1,7 +1,7 @@ -// $Id: angrystone.hpp 2642 2005-06-26 13:38:53Z matzebraun $ -// +// $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 @@ -12,7 +12,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -28,13 +28,14 @@ class AngryStone : public BadGuy public: AngryStone(const lisp::Lisp& reader); - void activate(); void write(lisp::Writer& writer); - HitResponse collision_solid(GameObject& other, const CollisionHit& hit); + void collision_solid(const CollisionHit& hit); HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); void active_update(float elapsed_time); void kill_fall(); + virtual AngryStone* clone() const { return new AngryStone(*this); } + protected: Vector attackDirection; /**< 1-normalized vector of current attack direction */ Vector oldWallDirection; /**< if wall was hit during last attack: 1-normalized vector of last attack direction, (0,0) otherwise */ @@ -48,7 +49,7 @@ protected: RECOVERING }; AngryStoneState state; - + }; #endif