X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrrocket.hpp;h=77a7634c4ba692d09b0b648715355359ebadec25;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=fe4658e9555048e58a99bf254966512841611b99;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git diff --git a/src/badguy/mrrocket.hpp b/src/badguy/mrrocket.hpp index fe4658e95..77a7634c4 100644 --- a/src/badguy/mrrocket.hpp +++ b/src/badguy/mrrocket.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 __MRROCKET_H__ #define __MRROCKET_H__ @@ -29,17 +28,17 @@ class MrRocket : public BadGuy { public: MrRocket(const lisp::Lisp& reader); - MrRocket(float pos_x, float pos_y, Direction d); + MrRocket(const Vector& pos, Direction d); void activate(); void active_update(float elapsed_time); void write(lisp::Writer& writer); - HitResponse collision_solid(GameObject& other, const CollisionHit& hit); + void collision_solid(const CollisionHit& hit); + + virtual MrRocket* clone() const { return new MrRocket(*this); } protected: bool collision_squished(Player& player); - bool set_direction; - Direction initial_direction; Timer collision_timer; };