Changeset 7544

Timestamp:

Oct 15, 2010, 8:14:03 AM (14 years ago)

Author:

dafrick

Message:

Fixing bug I introduced.

Location:

code/trunk

Files:

• data/levels/templates/pickup_representation_templates.oxt (modified) (3 diffs)
• src/modules/pickup/items/InvisiblePickup.cc (modified) (4 diffs)
• src/modules/pickup/items/InvisiblePickup.h (modified) (2 diffs)

code/trunk/data/levels/templates/pickup_representation_templates.oxt

@@ -344 +344 @@
     duration = 5.0
     activaionType = "immediate"
-    durationType = "once"
+    durationType = "continuous"
   />
 </Template>
@@ -368 +368 @@
     duration = 10.0
     activaionType = "immediate"
-    durationType = "once"
+    durationType = "continuous"
   />
 </Template>
@@ -392 +392 @@
     duration = 20.0
     activaionType = "immediate"
-    durationType = "once"
+    durationType = "continuous"
   />
 </Template>

code/trunk/src/modules/pickup/items/InvisiblePickup.cc

@@ -116 +116 @@
         if (this->isUsed())
         {
-            if(this->isContinuous()
+            if(this->isContinuous())
             {
                 if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() > 0.0f)
@@ -135 +135 @@
             this->setInvisible(false);
 
-            if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration())
+            if(this->isContinuous() || !this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration())
             {
                 this->Pickupable::destroy();
@@ -213 +213 @@
     /**
     @brief
-        Sets the duration.
+        Sets the time the InvisibilityPickup will last.
     @param duration
-        The duration
+        The duration in seconds.
     */
     void InvisiblePickup::setDuration(float duration)
@@ -230 +230 @@
     }
 
+    /**
+    @brief
+        Helper method. Is called by the Timer as soon as it expires.
+    */
     void InvisiblePickup::pickupTimerCallback(void)
     {

code/trunk/src/modules/pickup/items/InvisiblePickup.h

@@ -65 +65 @@
             InvisiblePickup(BaseObject* creator); //!< Constructor.
             virtual ~InvisiblePickup(); //!< Destructor.
+            
             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
@@ -75 +76 @@
             inline bool getInvisibility(bool)
                 { return this->invisible_; }
-            inline float getDuration()
+            /**
+            @brief Get the time the InvisibilityPickup lasts.
+            @return Returns the time in seconds the InvisibiltyPickup lasts.
+            */
+            inline float getDuration(void)
                 { return this->duration_; }
 
         protected:
+            void initializeIdentifier(void);
+
             bool setInvisible(bool invisibility); //!< Set the Pawn to be invisible or visible again.
-            void setDuration(float duration);
-            void initializeIdentifier(void);
-            void pickupTimerCallback(void); //!< Function that gets called when the timer ends.
+            void setDuration(float duration); //!< Sets the time the InvisibilityPickup will last.
+
+            void pickupTimerCallback(void); //!< Helper method. Is called by the Timer as soon as it expires.
 
         private: