Changeset 6708

Timestamp:

Apr 13, 2010, 9:07:08 AM (14 years ago)

Author:

dafrick

Message:

Some cleanup.

Location:

code/branches/ppspickups2/src/modules/pickup

Files:

• Pickup.cc (modified) (1 diff)
• Pickup.h (modified) (1 diff)
• PickupPrereqs.h (modified) (1 diff)
• PickupSpawner.cc (modified) (1 diff)
• items/CMakeLists.txt (modified) (1 diff)
• items/InvisiblePickup.cc (modified) (7 diffs)
• items/InvisiblePickup.h (modified) (1 diff)

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

@@ -250 +250 @@
             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/ppspickups2/src/modules/pickup/Pickup.h

@@ -137 +137 @@
             bool startPickupTimer(float durationTime);
 
-            virtual void PickupTimerCallBack(void) {}
+            virtual void pickupTimerCallback(void) {}
 
             /**

code/branches/ppspickups2/src/modules/pickup/PickupPrereqs.h

@@ -76 +76 @@
     //items
     class HealthPickup;
+    class InvisiblePickup;
     class MetaPickup;
     

code/branches/ppspickups2/src/modules/pickup/PickupSpawner.cc

@@ -103 +103 @@
     void PickupSpawner::initialize(void)
     {
-        this->triggerDistance_ = 20;
+        this->triggerDistance_ = 10;
         this->respawnTime_ = 0;
         this->maxSpawnedItems_ = INF;

code/branches/ppspickups2/src/modules/pickup/items/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(PICKUP_SRC_FILES
   HealthPickup.cc
+  InvisiblePickup.cc
   MetaPickup.cc
-  InvisiblePickup.cc
 )

code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc

@@ -55 +55 @@
     {
         RegisterObject(InvisiblePickup);
-        //! Defines who is allowed to pick up the pickup.
-        this->initialize(); 
+        //! Defines who is allowed to pick up the pickup.
+        this->initialize(); 
     }
     
@@ -70 +70 @@
     void InvisiblePickup::initializeIdentifier(void)
     {
-        std::stringstream stream;
-        stream << this->getDuration();
-        std::string type1 = "duration";
-        std::string val1 = stream.str();
-        this->pickupIdentifier_->addParameter(type1, val1);
+        std::stringstream stream;
+        stream << this->getDuration();
+        std::string type1 = "duration";
+        std::string val1 = stream.str();
+        this->pickupIdentifier_->addParameter(type1, val1);
     }
     
@@ -83 +83 @@
     void InvisiblePickup::initialize(void)
     {
-        this->duration_ = 0.0;
-        this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
+        this->duration_ = 0.0f;
+        this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
     }
 
@@ -94 +94 @@
     {
         SUPER(InvisiblePickup, XMLPort, xmlelement, mode);    
-        XMLPortParam(InvisiblePickup, "duration", setDuration, getDuration, xmlelement, mode);
-         
-         this->initializeIdentifier();
+        XMLPortParam(InvisiblePickup, "duration", setDuration, getDuration, xmlelement, mode);
+        
+        this->initializeIdentifier();
     }
     
@@ -106 +106 @@
     {
         SUPER(InvisiblePickup, changedUsed);
-        
         
         //! If the pickup is not picked up nothing must be done.
         if(!this->isPickedUp())
             return;
-        if (this->isUsed())
-        {
-            this->startPickupTimer(this->getDuration());
-            this->setInvisible(true);
-        }
-        else
-          this->setInvisible(false);
-        
+        
+        if (this->isUsed())
+        {
+            this->startPickupTimer(this->getDuration());
+            this->setInvisible(true);
+        }
+        else
+        {
+            this->setInvisible(false);
+            this->destroy();
+        }
+        
     }
     
@@ -151 +154 @@
         
         SUPER(InvisiblePickup, clone, item);
-        
-        InvisiblePickup* pickup = dynamic_cast<InvisiblePickup*>(item);
-        pickup->setDuration(this->getDuration());
-        pickup->initializeIdentifier();
+        
+        InvisiblePickup* pickup = dynamic_cast<InvisiblePickup*>(item);
+        pickup->setDuration(this->getDuration());
+        pickup->initializeIdentifier();
     }
     
@@ -160 +163 @@
     @brief
         Sets the invisibility.
-    @param health
+    @param invisibility
         The invisibility.
     */
     bool InvisiblePickup::setInvisible(bool invisibility)
     {
-      
-      Pawn* pawn = this->carrierToPawnHelper();
-      pawn->setVisible(!invisibility);
-      return 0;
-    }
-    
-    /**
-    @brief
-    Sets the duration.
+        Pawn* pawn = this->carrierToPawnHelper();
+        if(pawn == NULL)
+            return false;
+        
+        pawn->setVisible(!invisibility);
+        return true;
+    }
+    
+    /**
+    @brief
+        Sets the duration.
     @param duration
-    The duration
+        The duration
     */
     void InvisiblePickup::setDuration(float duration)
     {
-        if(duration >= 0.0f)
-        {
-            this->duration_ = duration;
-        }
-        else
-        {
-            COUT(1) << "Invalid duration in InvisiblePickup." << std::endl;
-            this->duration_ = 0;
-        }
-    }
-    
-    void InvisiblePickup::PickupTimerCallBack(void)
-    {
-        this->setInvisible(false);
+        if(duration >= 0.0f)
+        {
+            this->duration_ = duration;
+        }
+        else
+        {
+            COUT(1) << "Invalid duration in InvisiblePickup." << std::endl;
+            this->duration_ = 0.0f;
+        }
+    }
+    
+    void InvisiblePickup::pickupTimerCallback(void)
+    {
+        this->setUsed(false);
     }
 

code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.h

@@ -64 +64 @@
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
             
-             /**
-            @brief Checks wether the Pawn is invisible.
+            /**
+            @brief Checks whether the Pawn is invisible.
             @return Returns if the Pawn is invisible.
             */
             inline bool getInvisibility(bool)
                 { return this->invisible_; }
-            inline float getDuration()
-                {return this->duration_;}
+            inline float getDuration()
+                { return this->duration_; }
  
         protected:
-            bool setInvisible(bool invisibility); //!< Set the Pawn to be invisible or visible again.
-            void setDuration(float duration);
-            void initializeIdentifier(void);
+            bool setInvisible(bool invisibility); //!< Set the Pawn to be invisible or visible again.
+            void setDuration(float duration);
+            void initializeIdentifier(void);
+            virtual void pickupTimerCallback(void); //!< Function that gets called when the timer ends.
         
         private:
-           void initialize(void); //!< Initializes the member variables.
+            void initialize(void); //!< Initializes the member variables.
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-            void PickupTimerCallBack(void); //!< Function that gets called when the timer ends.
-            bool invisible_; //!< Helper to remember wether the Pawn is invisible.
-            float duration_; //! Duration of invisibility.
+            bool invisible_; //!< Helper to remember wether the Pawn is invisible.
+            float duration_; //! Duration of invisibility.
     };
 }