Changeset 6705

Timestamp:

Apr 13, 2010, 12:09:10 AM (14 years ago)

Author:

dafrick

Message:

Minor cleanup.

Location:

code/branches/ppspickups1/src

Files:

• modules/pickup/Pickup.cc (modified) (2 diffs)
• modules/pickup/Pickup.h (modified) (3 diffs)
• modules/pickup/items/SpeedPickup.h (modified) (1 diff)
• orxonox/items/Engine.h (modified) (1 diff)
• orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)

code/branches/ppspickups1/src/modules/pickup/Pickup.cc

@@ -236 +236 @@
     /**
     @brief
-        Starts the Pickup duration Timer.
+        Starts the pickup duration timer.
+        After the specified durationTime has expired the function pickupTimerCallback is called.
+        pickupTimerCallback can be overloaded and thus the desired functionality can be implemented.
+    @param durationTime
+        The duration after which the expires and the callback function is called.
+    @return
+        Returns true if the pickup duration timer was started successfully, false if not.
     */
     bool Pickup::startPickupTimer(float durationTime)
@@ -245 +251 @@
             return false;
         }
-        if (false) /* TODO: Check if Timer is already running */
+        if (this->durationTimer_.isActive()) //!< Check if Timer is already running
         {
             COUT(1) << "Pickup durationTimer already in use." << std::endl;
             return false;
         }
-        this->durationTimer_.setTimer(durationTime, false, createExecutor(createFunctor(&Pickup::PickupTimerCallBack, this)));
+        this->durationTimer_.setTimer(durationTime, false, createExecutor(createFunctor(&Pickup::pickupTimerCallback, this)));
         return true;
     }

code/branches/ppspickups1/src/modules/pickup/Pickup.h

@@ -137 +137 @@
             bool startPickupTimer(float durationTime);
 
-            virtual void PickupTimerCallBack(void) {}
+            virtual void pickupTimerCallback(void) {}
 
             /**
@@ -157 +157 @@
         private:
             void initialize(void); //!< Initializes the member variables.
+            
+            //TODO: Problems, when there are more Timers needed? Solutions?
+            Timer durationTimer_; //!< Timer at the disposal of each Class implementing Pickup.
 
             pickupActivationType::Value activationType_; //!< The activation type of the Pickup.
@@ -165 +168 @@
             static const std::string durationTypeOnce_s;
             static const std::string durationTypeContinuous_s;
-
-            float durationTime_;
-            Timer durationTimer_;
     };
 

code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h

@@ -94 +94 @@
 }
 
-#endif // _HealthPickup_H__
+#endif // _SpeedPickup_H__

code/branches/ppspickups1/src/orxonox/items/Engine.h

@@ -115 +115 @@
             virtual const Vector3& getCarrierPosition(void);
 
-            /* Should not be here */
+            //TODO: Move to protected or private. How?
             inline void setSpeedAdd(float speedAdd)
                 { this->speedAdd_=speedAdd; }

code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -224 +224 @@
     {
         std::list<PickupCarrier*>* list = new std::list<PickupCarrier*>();
-        list->push_front(engine_);
+        list->push_front(this->engine_);
         return list;
     }