X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Finfoblock.hpp;h=864856627d268b143b0d61d98b68dc716a138b37;hb=7831e810062da90ebb745f8e1a4346bc1e80e3ed;hp=65eaf16a6567943a7e82bd0cdfa1b5dcc1d03057;hpb=9e996e1eaca344660c9fed91abf44566a4cbe8d5;p=supertux.git

diff --git a/src/object/infoblock.hpp b/src/object/infoblock.hpp
index 65eaf16a6..864856627 100644
--- 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);
@@ -37,14 +33,19 @@ public:
 
 protected:
   virtual void hit(Player& player);
+  virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
+  Player* get_nearest_player();
+
+protected:
   std::string message;
   //AmbientSound* ringing;
   //bool stopped;
   float shown_pct; /**< Value in the range of 0..1, depending on how much of the infobox is currently shown */
   float dest_pct; /**< With each call to update(), shown_pct will slowly transition to this value */
-  std::auto_ptr<InfoBox> infoBox;
-
-  Player* get_nearest_player();
+  std::vector<InfoBoxLine*> lines; /**< lines of text (or images) to display */
+  float lines_height;
 };
 
 #endif
+
+/* EOF */