X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fsmartball.cpp;h=ad566d6c95d41e72a5a9cfb285452a79d197ab7c;hb=ac0af7757398d7acaf46e9be43c89ef6d7a497b4;hp=aaf433bb48939b7d708a4282276308e347021db9;hpb=6c048de80b00a88e9c43290b1e5ccd1dd35e74a4;p=supertux.git diff --git a/src/badguy/smartball.cpp b/src/badguy/smartball.cpp index aaf433bb4..ad566d6c9 100644 --- a/src/badguy/smartball.cpp +++ b/src/badguy/smartball.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux - Smart Snowball // Copyright (C) 2008 Wolfgang Becker // -// 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 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 3 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 @@ -14,22 +12,22 @@ // 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. +// along with this program. If not, see . -#include +#include "badguy/smartball.hpp" -#include "smartball.hpp" +#include "sprite/sprite.hpp" +#include "supertux/object_factory.hpp" -SmartBall::SmartBall(const lisp::Lisp& reader) - : WalkingBadguy(reader, "images/creatures/snowball/smart-snowball.sprite", "left", "right") +SmartBall::SmartBall(const Reader& reader) + : WalkingBadguy(reader, "images/creatures/snowball/smart-snowball.sprite", "left", "right") { walk_speed = 80; max_drop_height = 16; } SmartBall::SmartBall(const Vector& pos, Direction d) - : WalkingBadguy(pos, d, "images/creatures/snowball/smart-snowball.sprite", "left", "right") + : WalkingBadguy(pos, d, "images/creatures/snowball/smart-snowball.sprite", "left", "right") { walk_speed = 80; max_drop_height = 16; @@ -43,4 +41,4 @@ SmartBall::collision_squished(GameObject& object) return true; } -IMPLEMENT_FACTORY(SmartBall, "smartball") +/* EOF */