stopped infoblocks from ringing, since they're not telephones anymore - code is only...

SVN-Revision: 3212

diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp
index df6d7ee..6e98963 100644 (file)
--- a/src/object/infoblock.cpp
+++ b/src/object/infoblock.cpp
@@ -40,9 +40,9 @@ InfoBlock::InfoBlock(const lisp::Lisp& lisp)
   if(!lisp.get("message", message)) {
     msg_warning("No message in InfoBlock");
   }
-  stopped = false;
-  ringing = new AmbientSound(get_pos(), 0.5, 300, 1, "sounds/phone.wav");
-  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()
@@ -53,10 +53,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);
 }
 

diff --git a/src/object/infoblock.hpp b/src/object/infoblock.hpp
index 78d86f0..f4be86b 100644 (file)
--- a/src/object/infoblock.hpp
+++ b/src/object/infoblock.hpp
@@ -22,7 +22,7 @@
 #define __INFOBLOCK_H__
 
 #include "block.hpp"
-#include "object/ambient_sound.hpp"
+//#include "object/ambient_sound.hpp"
 
 class InfoBlock : public Block
 {
@@ -33,8 +33,8 @@ public:
 protected:
   virtual void hit(Player& player);
   std::string message;
-  AmbientSound* ringing;
-  bool stopped;
+  //AmbientSound* ringing;
+  //bool stopped;
 };
 
 #endif