Changeset 5895 for code/branches/core5

Timestamp:

Oct 6, 2009, 9:42:58 PM (15 years ago)

Author:

landauf

Message:

Attempt to fix a crash when switching from a level back to the mainmenu

Location:

code/branches/core5/src

Files:

• modules/overlays/hud/ChatOverlay.cc (modified) (2 diffs)
• modules/overlays/hud/ChatOverlay.h (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/graphics/ParticleEmitter.h (modified) (1 diff)
• orxonox/interfaces/RadarViewable.h (modified) (1 diff)

code/branches/core5/src/modules/overlays/hud/ChatOverlay.cc

@@ -58 +58 @@
     ChatOverlay::~ChatOverlay()
     {
+        for (std::set<Timer*>::iterator it = this->timers_.begin(); it != this->timers_.end(); ++it)
+            delete (*it);
     }
 
@@ -87 +89 @@
         COUT(0) << "Chat: " << text << std::endl;
 
-        new Timer(this->displayTime_, false, createExecutor(createFunctor(&ChatOverlay::dropMessage, this)), true);
+        Timer* timer = new Timer();
+        this->timers_.insert(timer); // store the timer in a set to destroy it in the destructor
+        Executor* executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
+        executor->setDefaultValues(timer);
+        timer->setTimer(this->displayTime_, false, executor, true);
 
         this->updateOverlayText();
     }
 
-    void ChatOverlay::dropMessage()
+    void ChatOverlay::dropMessage(Timer* timer)
     {
         if (this->messages_.size() > 0)
             this->messages_.pop_front();
         this->updateOverlayText();
+        this->timers_.erase(timer); // the timer destroys itself, but we have to remove it from the set
     }
 

code/branches/core5/src/modules/overlays/hud/ChatOverlay.h

@@ -55 +55 @@
         private:
             void updateOverlayText();
-            void dropMessage();
+            void dropMessage(Timer* timer);
 
             float displayTime_;
+            std::set<Timer*> timers_;
     };
 }

code/branches/core5/src/orxonox/OrxonoxPrereqs.h

@@ -37 +37 @@
 
 #include "OrxonoxConfig.h"
+#include "tools/ToolsPrereqs.h"
 
 //-----------------------------------------------------------------------

code/branches/core5/src/orxonox/graphics/ParticleEmitter.h

@@ -34 +34 @@
 #include <string>
 #include "worldentities/StaticEntity.h"
-#include "tools/ToolsPrereqs.h"
 
 namespace orxonox

code/branches/core5/src/orxonox/interfaces/RadarViewable.h

@@ -38 +38 @@
 #include "util/OgreForwardRefs.h"
 #include "core/OrxonoxClass.h"
-#include "tools/ToolsPrereqs.h"
 
 namespace orxonox