Changeset 11032 for code/branches/presentationHS15/src/orxonox/gametypes/Dynamicmatch.cc

Timestamp:

Jan 4, 2016, 12:07:42 AM (8 years ago)

Author:

landauf

Message:

fixed another situation where a timer may keep existing after the level was unloaded.
there is, however, yet another bug in this piece of code (marked with a TODO): a spaceship can be destroyed before the timer is executed which leads to a crash.

File:

• code/branches/presentationHS15/src/orxonox/gametypes/Dynamicmatch.cc (modified) (4 diffs)

code/branches/presentationHS15/src/orxonox/gametypes/Dynamicmatch.cc

@@ -86 +86 @@
     }
 
+    Dynamicmatch::~Dynamicmatch()
+    {
+        for (std::set<Timer*>::iterator it = this->piggyTimers_.begin(); it != this->piggyTimers_.end(); ++it)
+            delete (*it);
+    }
+
     void Dynamicmatch::setConfigValues()
     {
@@ -312 +318 @@
             spaceship->addSpeedFactor(5);
             ExecutorPtr executor = createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this));
-            executor->setDefaultValue(0, spaceship);
-            new Timer(10, false, executor, true);
+            Timer* timer = new Timer(10, false, executor);
+            executor->setDefaultValue(0, spaceship); // TODO: use WeakPtr because spaceship can be destroyed in the meantime
+            executor->setDefaultValue(1, timer);
+            this->piggyTimers_.insert(timer);
         }
     }
@@ -590 +598 @@
     }
 
-    void Dynamicmatch::resetSpeedFactor(SpaceShip* spaceship)// helper function
+    void Dynamicmatch::resetSpeedFactor(SpaceShip* spaceship, Timer* timer)// helper function
     {
         if (spaceship)
@@ -596 +604 @@
             spaceship->addSpeedFactor(1.0f/5.0f);
         }
+
+        this->piggyTimers_.erase(timer);
+        delete timer;
     }