X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.hpp;h=845c063a3d45bd01b1f18c79786d73e662f1710d;hb=4a486d92343d1824b311c234e9321e08f280fe68;hp=8495f003172f3a989fed0e34bc4d901f589421dd;hpb=d54bc022663f96293582cfd13b3bb19b7b91b048;p=supertux.git diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp index 8495f0031..845c063a3 100644 --- a/src/badguy/mrbomb.hpp +++ b/src/badguy/mrbomb.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,36 +12,29 @@ // 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 __MRBOMB_H__ #define __MRBOMB_H__ -#include "badguy.hpp" +#include "walking_badguy.hpp" -class MrBomb : public BadGuy +class MrBomb : public WalkingBadguy { public: MrBomb(const lisp::Lisp& reader); - MrBomb(float pos_x, float pos_y, Direction d, bool stay_on_plat); + MrBomb(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); - HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); void kill_fall(); + virtual MrBomb* clone() const { return new MrBomb(*this); } + protected: bool collision_squished(Player& player); - bool set_direction; - bool stay_on_platform; - Direction initial_direction; }; #endif -