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

[supertux.git] / src / object / infoblock.cpp

diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp
index 0c293c7..9b9e5ae 100644 (file)
--- a/src/object/infoblock.cpp
+++ b/src/object/infoblock.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.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,34 +12,28 @@
 //  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 "infoblock.hpp"
+#include "object/infoblock.hpp"
 
-#include "game_session.hpp"
-#include "resources.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "object_factory.hpp"
-#include "lisp/lisp.hpp"
-#include "sector.hpp"
-#include "log.hpp"
 #include "object/player.hpp"
-#include "main.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
-#include "object/camera.hpp"
 
 namespace {
-  const float SCROLL_DELAY = 0.5;
-  const float SCROLL_DISTANCE = 16;
-  const float WIDTH = 400;
-  const float HEIGHT = 200;
+const float SCROLL_DELAY = 0.5;
+const float SCROLL_DISTANCE = 16;
+const float WIDTH = 400;
+const float HEIGHT = 200;
 }
 
-InfoBlock::InfoBlock(const lisp::Lisp& lisp)
-  : Block(sprite_manager->create("images/objects/bonus_block/infoblock.sprite")), shown_pct(0), dest_pct(0)
+InfoBlock::InfoBlock(const Reader& lisp) :
+  Block(sprite_manager->create("images/objects/bonus_block/infoblock.sprite")), 
+  shown_pct(0), 
+  dest_pct(0)
 {
   Vector pos;
   lisp.get("x", pos.x);
@@ -198,4 +190,6 @@ InfoBlock::hide_message()
   dest_pct = 0;
 }
 
-IMPLEMENT_FACTORY(InfoBlock, "infoblock")
+IMPLEMENT_FACTORY(InfoBlock, "infoblock");
+
+/* EOF */