X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fspiky.cpp;h=7dbe450d5f20cac86b251eb399abdd15713ba4db;hb=07ddaed2a657e4d2a3d038fed223fc5827159caf;hp=b419740dfe0b84e6d1ac7d16f2f524e07134d40c;hpb=3510a03c0e807c7a0ddde3cdf07ba91bda9393c4;p=supertux.git diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp index b419740df..7dbe450d5 100644 --- a/src/badguy/spiky.cpp +++ b/src/badguy/spiky.cpp @@ -1,6 +1,25 @@ +// $Id$ +// +// SuperTux +// 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 +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// 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. + #include -#include "spiky.h" +#include "spiky.hpp" static const float WALKSPEED = 80; @@ -9,7 +28,7 @@ Spiky::Spiky(const lisp::Lisp& reader) reader.get("x", start_position.x); reader.get("y", start_position.y); bbox.set_size(31.8, 31.8); - sprite = sprite_manager->create("spiky"); + sprite = sprite_manager->create("images/creatures/spiky/spiky.sprite"); } void @@ -17,8 +36,8 @@ Spiky::write(lisp::Writer& writer) { writer.start_list("spiky"); - writer.write_float("x", get_pos().x); - writer.write_float("y", get_pos().y); + writer.write_float("x", start_position.x); + writer.write_float("y", start_position.y); writer.end_list("spiky"); } @@ -56,3 +75,4 @@ Spiky::collision_badguy(BadGuy& , const CollisionHit& hit) return CONTINUE; } +IMPLEMENT_FACTORY(Spiky, "spiky")