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

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

diff --git a/src/object/infoblock.hpp b/src/object/infoblock.hpp
index 21e2ae4..28157ae 100644 (file)
--- a/src/object/infoblock.hpp
+++ b/src/object/infoblock.hpp
@@ -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,20 +12,18 @@
 //  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 <http://www.gnu.org/licenses/>.
 
-#ifndef __INFOBLOCK_H__
-#define __INFOBLOCK_H__
+#ifndef HEADER_SUPERTUX_OBJECT_INFOBLOCK_HPP
+#define HEADER_SUPERTUX_OBJECT_INFOBLOCK_HPP
 
-#include "block.hpp"
-//#include "object/ambient_sound.hpp"
-#include "textscroller.hpp"
+#include "object/block.hpp"
+#include "supertux/textscroller.hpp"
 
 class InfoBlock : public Block
 {
 public:
-  InfoBlock(const lisp::Lisp& lisp);
+  InfoBlock(const Reader& lisp);
   virtual ~InfoBlock();
   void update(float elapsed_time);
   void draw(DrawingContext& context);
@@ -50,3 +46,5 @@ protected:
 };
 
 #endif
+
+/* EOF */