X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbouncing_snowball.hpp;h=b2265909c1f54992e5209cb2fe176bc568c976bd;hb=126aa9428c83eb1e17d4a75a55d15e3e6e0c6875;hp=ae2ce4632a28de83827fb68094600c0c4a23469f;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git diff --git a/src/badguy/bouncing_snowball.hpp b/src/badguy/bouncing_snowball.hpp index ae2ce4632..b2265909c 100644 --- a/src/badguy/bouncing_snowball.hpp +++ b/src/badguy/bouncing_snowball.hpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,11 +12,10 @@ // 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 -// 02111-1307, USA. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef __BOUNCING_SNOWBALL_H__ #define __BOUNCING_SNOWBALL_H__ @@ -27,17 +26,17 @@ class BouncingSnowball : public BadGuy { public: BouncingSnowball(const lisp::Lisp& reader); - BouncingSnowball(float pos_x, float pos_y, Direction d); + BouncingSnowball(const Vector& pos, Direction d); 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); + virtual BouncingSnowball* clone() const { return new BouncingSnowball(*this); } + protected: bool collision_squished(Player& player); - bool set_direction; - Direction initial_direction; }; #endif