fixed critical telephone bug (thanks for noticing, Matze)

SVN-Revision: 2542

diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp
index 2eb7ca2..55e2e30 100644 (file)
--- a/src/object/infoblock.cpp
+++ b/src/object/infoblock.cpp
@@ -39,8 +39,9 @@ InfoBlock::InfoBlock(const lisp::Lisp& lisp)
   if(!lisp.get("message", message)) {
     std::cerr << "No message in InfoBlock!\n";
   }
+  stopped = false;
   ringing = new AmbientSound(get_pos(), 0.5, 300, 1, "phone");
-  Sector::current()->add_object(ringing);
+  Sector::current()->add_object(ringing);  
 }
 
 InfoBlock::~InfoBlock()
@@ -52,7 +53,10 @@ InfoBlock::hit(Player& )
 {
   GameSession::current()->display_info_box(message);
   start_bounce();
-  ringing->remove_me();
+  if (!stopped) {
+    ringing->remove_me();
+    stopped = true;
+  }
 }
 
 IMPLEMENT_FACTORY(InfoBlock, "infoblock")

diff --git a/src/object/infoblock.h b/src/object/infoblock.h
index 9f6a670..d67cb81 100644 (file)
--- a/src/object/infoblock.h
+++ b/src/object/infoblock.h
@@ -34,6 +34,7 @@ protected:
   virtual void hit(Player& player);
   std::string message;
   AmbientSound* ringing;
+  bool stopped;
 };
 
 #endif