Changeset 10557 for code/branches/core7/src/orxonox

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.

Location:

code/branches/core7/src/orxonox

Files:

• gametypes/Dynamicmatch.cc (modified) (2 diffs)
• gametypes/Dynamicmatch.h (modified) (1 diff)
• infos/PlayerInfo.cc (modified) (1 diff)
• interfaces/InterfaceCompilation.cc (modified) (1 diff)
• sound/SoundManager.cc (modified) (2 diffs)
• sound/SoundManager.h (modified) (1 diff)

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);
+        }
     }
 

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

@@ -77 +77 @@
             virtual void rewardPig();
             void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost.
-            void resetSpeedFactor(WeakPtr<SpaceShip>* ptr);
+            void resetSpeedFactor(SpaceShip* spaceship);
             void tick (float dt);// used to end the game
             SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;

code/branches/core7/src/orxonox/infos/PlayerInfo.cc

@@ -186 +186 @@
 
         this->controllableEntity_->destroyHud(); // HACK-ish
-        this->previousControllableEntity_.push_back(WeakPtr<ControllableEntity>(this->controllableEntity_));
+        this->previousControllableEntity_.push_back(this->controllableEntity_);
         this->controllableEntity_ = entity;
         this->controllableEntityID_ = entity->getObjectID();

code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -72 +72 @@
     {
         assert(pawn);
-        this->pawn_ = WeakPtr<Pawn>(pawn);
+        this->pawn_ = pawn;
         if (pawn)
-            this->player_ = WeakPtr<PlayerInfo>(pawn->getPlayer());
+            this->player_ = pawn->getPlayer();
     }
 

code/branches/core7/src/orxonox/sound/SoundManager.cc

@@ -419 +419 @@
     }
 
-    void SoundManager::fadeIn(const StrongPtr<AmbientSound>& sound)
+    void SoundManager::fadeIn(AmbientSound* sound)
     {
         // If we're already fading out --> remove that
@@ -435 +435 @@
     }
 
-    void SoundManager::fadeOut(const StrongPtr<AmbientSound>& sound)
+    void SoundManager::fadeOut(AmbientSound* sound)
     {
         // If we're already fading in --> remove that

code/branches/core7/src/orxonox/sound/SoundManager.h

@@ -106 +106 @@
     private:
         void processCrossFading(float dt);
-        void fadeIn(const StrongPtr<AmbientSound>& sound);
-        void fadeOut(const StrongPtr<AmbientSound>& sound);
+        void fadeIn(AmbientSound* sound);
+        void fadeOut(AmbientSound* sound);
 
         void checkFadeStepValidity();