X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fnolok_01.hpp;h=460d05e930a47cb6b41144e3dfa6b31a182ee7e1;hb=bbecaf79e2406262c12d4c33dd92bcdb656cd561;hp=fddb503b5f72834fa572f4a03b39527581848ed0;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git diff --git a/src/badguy/nolok_01.hpp b/src/badguy/nolok_01.hpp index fddb503b5..460d05e93 100644 --- a/src/badguy/nolok_01.hpp +++ b/src/badguy/nolok_01.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 __NOLOK01_H__ #define __NOLOK01_H__ @@ -28,14 +27,16 @@ class Nolok_01 : public BadGuy { public: Nolok_01(const lisp::Lisp& reader); - Nolok_01(float pos_x, float pos_y); + Nolok_01(const Vector& pos); void activate(); void write(lisp::Writer& writer); void active_update(float elapsed_time); void kill_fall(); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); - + + virtual Nolok_01* clone() const { return new Nolok_01(*this); } + protected: bool collision_squished(Player& player); Timer action_timer;