Changeset 9340 for code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc

Timestamp:

Aug 20, 2012, 4:46:52 PM (12 years ago)

Author:

jo

Message:

On the way of repairing a bug that was caused by manual refactoring of gametype's playerScored function.

File:

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

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

@@ -310 +310 @@
         if (spaceship)
         {
+            WeakPtr<SpaceShip>* ptr = new WeakPtr<SpaceShip>(spaceship);
+            if(ptr == NULL)
+                return;
             spaceship->addSpeedFactor(5);
-            WeakPtr<SpaceShip>* ptr = new WeakPtr<SpaceShip>(spaceship);
             ExecutorPtr executor = createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this));
             executor->setDefaultValue(0, ptr);
@@ -490 +492 @@
         }
         //killers: every 4th player is a killer
-        if (getPlayerCount()/4 > (int)numberOf[killer])
+        if ( static_cast<unsigned int>(getPlayerCount()/4) > numberOf[killer])
         {
             notEnoughKillers=true;