X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Finfoblock.cpp;h=aff82ac53ae1462187c8e4442295cbe633f896df;hb=7b6e4c78fe9366f3beff03acdd8310d979d8b2a5;hp=1008c07908e75257e49a30a93284b1cdf39c969d;hpb=2728d18a492273475c326a952fe40f8cb317a6b1;p=supertux.git

diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp
index 1008c0790..aff82ac53 100644
--- a/src/object/infoblock.cpp
+++ b/src/object/infoblock.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,11 +12,10 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
@@ -27,9 +26,10 @@
 #include "object_factory.hpp"
 #include "lisp/lisp.hpp"
 #include "sector.hpp"
+#include "log.hpp"
 
 InfoBlock::InfoBlock(const lisp::Lisp& lisp)
-  : Block(sprite_manager->create("infoblock"))
+  : Block(sprite_manager->create("images/objects/bonus_block/infoblock.sprite"))
 {
   Vector pos;
   lisp.get("x", pos.x);
@@ -37,11 +37,11 @@ InfoBlock::InfoBlock(const lisp::Lisp& lisp)
   bbox.set_pos(pos);
 
   if(!lisp.get("message", message)) {
-    std::cerr << "No message in InfoBlock!\n";
+    log_warning << "No message in InfoBlock" << std::endl;
   }
-  stopped = false;
-  ringing = new AmbientSound(get_pos(), 0.5, 300, 1, "phone");
-  Sector::current()->add_object(ringing);  
+  //stopped = false;
+  //ringing = new AmbientSound(get_pos(), 0.5, 300, 1, "sounds/phone.wav");
+  //Sector::current()->add_object(ringing);  
 }
 
 InfoBlock::~InfoBlock()
@@ -52,10 +52,10 @@ void
 InfoBlock::hit(Player& )
 {
   start_bounce();
-  if (!stopped) {
-    ringing->remove_me();
-    stopped = true;
-  }
+  //if (!stopped) {
+  //  ringing->remove_me();
+  //  stopped = true;
+  //}
   GameSession::current()->display_info_box(message);
 }