Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / badguy / captainsnowball.cpp

diff --git a/src/badguy/captainsnowball.cpp b/src/badguy/captainsnowball.cpp
index 0c79075..4eeaa13 100644 (file)
--- a/src/badguy/captainsnowball.cpp
+++ b/src/badguy/captainsnowball.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2008 Wolfgang Becker <uafr@gmx.de>
 //
-//  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,25 +12,21 @@
 //  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 <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "captainsnowball.hpp"
+#include "badguy/captainsnowball.hpp"
 
-#include "object_factory.hpp"
-#include "sector.hpp"
 #include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 
 namespace{
   static const float WALK_SPEED = 100; 
   static const float BOARDING_SPEED = 200;
 }
 
-
-CaptainSnowball::CaptainSnowball(const lisp::Lisp& reader)
-    : WalkingBadguy(reader, "images/creatures/snowball/cpt-snowball.sprite", "left", "right")
+CaptainSnowball::CaptainSnowball(const Reader& reader)
+  : WalkingBadguy(reader, "images/creatures/snowball/cpt-snowball.sprite", "left", "right")
 {
   walk_speed = BOARDING_SPEED;
   max_drop_height = -1;
@@ -40,7 +34,7 @@ CaptainSnowball::CaptainSnowball(const lisp::Lisp& reader)
 }
 
 CaptainSnowball::CaptainSnowball(const Vector& pos, Direction d)
-    : WalkingBadguy(pos, d, "images/creatures/snowball/cpt-snowball.sprite", "left", "right")
+  : WalkingBadguy(pos, d, "images/creatures/snowball/cpt-snowball.sprite", "left", "right")
 {
   // Created during game eg. by dispencer. Board the enemy!
   walk_speed = BOARDING_SPEED;
@@ -101,4 +95,6 @@ CaptainSnowball::collision_squished(GameObject& object)
   return true;
 }
 
-IMPLEMENT_FACTORY(CaptainSnowball, "captainsnowball")
+IMPLEMENT_FACTORY(CaptainSnowball, "captainsnowball");
+
+/* EOF */