Changeset 10557 for code/branches/core7/src/orxonox/gametypes/Dynamicmatch.cc

Timestamp:

Aug 29, 2015, 6:18:30 PM (9 years ago)

Author:

landauf

Message:

cleanup: no need to pass/return WeakPtrs to/from functions. normal pointers are enough.

File:

• code/branches/core7/src/orxonox/gametypes/Dynamicmatch.cc (modified) (2 diffs)

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

@@ -310 +310 @@
         if (spaceship)
         {
-            WeakPtr<SpaceShip>* ptr = new WeakPtr<SpaceShip>(spaceship);
-            if(ptr == NULL)
-                return;
             spaceship->addSpeedFactor(5);
             ExecutorPtr executor = createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this));
-            executor->setDefaultValue(0, ptr);
+            executor->setDefaultValue(0, spaceship);
             new Timer(10, false, executor, true);
         }
@@ -593 +590 @@
     }
 
-    void Dynamicmatch::resetSpeedFactor(WeakPtr<SpaceShip>* ptr)// helper function
-    {
-        if (*ptr)
-        {
-            (*ptr)->addSpeedFactor(1.0f/5.0f);
-        }
-        delete ptr;
+    void Dynamicmatch::resetSpeedFactor(SpaceShip* spaceship)// helper function
+    {
+        if (spaceship)
+        {
+            spaceship->addSpeedFactor(1.0f/5.0f);
+        }
     }