Changeset 9241 for code/branches/presentation2012/src/modules/pickup

Timestamp:

May 24, 2012, 8:49:19 PM (13 years ago)

Author:

decapitb

Message:

tower defense update

Location:

code/branches/presentation2012

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/modules (modified) (1 prop)
• src/modules/pickup (modified) (1 prop)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/items/FlagPickup.cc (copied) (copied from code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.cc) (4 diffs)
• src/modules/pickup/items/FlagPickup.h (copied) (copied from code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h) (3 diffs)

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

@@ -68 +68 @@
 namespace orxonox
 {
-
     class CollectiblePickup;
     class DroppedPickup;

code/branches/presentation2012/src/modules/pickup/items/FlagPickup.cc

@@ -28 +28 @@
 
 /**
-    @file FlagPickup.cc
-    @brief Implementation of the FlagPickup class.
-*/
+ @file FlagPickup.cc
+ @brief Implementation of the FlagPickup class.
+ */
 
 #include "FlagPickup.h"
@@ -37 +37 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-
 #include "pickup/PickupIdentifier.h"
 
 namespace orxonox
 {
-
+    
     CreateFactory(FlagPickup);
-
+    
     /**
-    @brief
-        Constructor. Registers the object and initializes the member variables.
-    */
+     @brief
+     Constructor. Registers the object and initializes the member variables.
+     */
     FlagPickup::FlagPickup(BaseObject* creator) : Pickup(creator)
     {
         RegisterObject(FlagPickup);
-
+        
         this->initialize();
     }
-
+    
     /**
-    @brief
-        Destructor.
-    */
+     @brief
+     Destructor.
+     */
     FlagPickup::~FlagPickup()
     {
-
+        
     }
-
+    
     /**
-    @brief
-        Initializes the member variables.
-    */
+     @brief
+     Initializes the member variables.
+     */
     void FlagPickup::initialize(void)
     {
         this->flagType_ = 0;
-
+        
         this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
     }
-
+    
     /**
-    @brief
-        Initializes the PickupIdentifier of this pickup.
-    */
+     @brief
+     Initializes the PickupIdentifier of this pickup.
+     */
     void FlagPickup::initializeIdentifier(void)
     {
@@ -90 +89 @@
         this->pickupIdentifier_->addParameter(type1, val);
     }
-
+    
     /**
-    @brief
-        Method for creating a FlagPickup object through XML.
-    */
+     @brief
+     Method for creating a FlagPickup object through XML.
+     */
     void FlagPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
     {
         SUPER(FlagPickup, XMLPort, xmlelement, mode);
-
+        
         XMLPortParam(FlagPickup, "flagType", setFlagType, getFlagType, xmlelement, mode);
         //XMLPortParam(FlagPickup, "teamNumber", setTeamNumber, getTeamNumber, xmlelement, mode);
-
+        
         this->initializeIdentifier();
     }
-
-
+    
+    
     /**
-    @brief
-        Get the flag type of this pickup.
-    @return
-        Returns the falg type as a string.
-    */
+     @brief
+     Get the flag type of this pickup.
+     @return
+     Returns the falg type as a string.
+     */
     const int FlagPickup::getFlagType(void) const
     {
                 return this->flagType_;
         }
-
+    
     /**
-    @brief
-        Set the type of the HealthPickup.
-    @param type
-        The type as a string.
-    */
+     @brief
+     Set the type of the FlagPickup.
+     @param type
+     The type as a string.
+     */
     void FlagPickup::setFlagType(int type)
     {
@@ -133 +132 @@
         }
     }
+    
+    /**
+     @brief
+     Is called when the pickup has transited from used to unused or the other way around.
+     */
+    void FlagPickup::changedUsed(void)
+    {
+        SUPER(FlagPickup, changedUsed);
+        
+        Pawn* pawn = this->carrierToPawnHelper();
+        
+        if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+            this->Pickupable::destroy();
+        
+        // If the pickup has transited to used.
+        if(this->isUsed())
+        {
+            this->bPickedUp_ = true;
+            this->pickedUpBy_ = pawn;
+            orxout(internal_error, context::pickups) << "flag picked up." << endl;
 
+        }
+    }
+    
     /**
-       @brief
-           Is called when the pickup has transited from used to unused or the other way around.
-       */
-       void FlagPickup::changedUsed(void)
-       {
-           SUPER(FlagPickup, changedUsed);
-
-           Pawn* pawn = this->carrierToPawnHelper();
-
-           if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
-               this->Pickupable::destroy();
-
-           // If the pickup has transited to used.
-           if(this->isUsed())
-           {
-                 this->bPickedUp_ = true;
-                 this->pickedUpBy_ = pawn;
-           }
-       }
-
-       /**
-       @brief
-           Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-       @return
-           A pointer to the Pawn, or NULL if the conversion failed.
-       */
-       Pawn* FlagPickup::carrierToPawnHelper(void)
-       {
-           PickupCarrier* carrier = this->getCarrier();
-           Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-
-           if(pawn == NULL)
-               orxout(internal_error, context::pickups) << "Invalid PickupCarrier in HealthPickup." << endl;
-
-           return pawn;
-       }
-
-
-
+     @brief
+     Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
+     @return
+     A pointer to the Pawn, or NULL if the conversion failed.
+     */
+    Pawn* FlagPickup::carrierToPawnHelper(void)
+    {
+        PickupCarrier* carrier = this->getCarrier();
+        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        
+        if(pawn == NULL)
+            orxout(internal_error, context::pickups) << "Invalid PickupCarrier in Flag Pickup." << endl;
+        
+        return pawn;
+    }
+    
+    
+    
         void FlagPickup::tick(float dt)
-           {
-                   SUPER(FlagPickup, tick, dt);
-
-               Pawn* pawn = this->carrierToPawnHelper();
-
-                   if(pawn->isAlive() && pawn->hasFlag()){
-               this->Pickupable::destroy();
-                   }
-
-           }
+    {
+        SUPER(FlagPickup, tick, dt);
+        
+        //Pawn* pawn = this->carrierToPawnHelper();
+        
+//        if(pawn->isAlive() && pawn->hasFlag()){
+//            this->Pickupable::destroy();
+//        }
+        
+    }
 }

code/branches/presentation2012/src/modules/pickup/items/FlagPickup.h

@@ -28 +28 @@
 
 /**
-    @file FlagPickup.h
-    @brief Declaration of the FlagPickup class.
-    @ingroup PickupItems
-*/
+ @file FlagPickup.h
+ @brief Declaration of the FlagPickup class.
+ @ingroup PickupItems
+ */
 
 #ifndef _FlagPickup_H__
@@ -47 +47 @@
 
 namespace orxonox {
-/*
-    @ingroup PickupItems
-    
-
-    @author
-        Nino Weingart
-
-    @ingroup PickupItems
-    */
+    /*
+     @ingroup PickupItems
+     
+     
+     @author
+     Nino Weingart
+     
+     @ingroup PickupItems
+     */
     class _PickupExport FlagPickup : public Pickup, public Tickable
     {
-        public:
-
-            FlagPickup(BaseObject* creator); //!< Constructor.
-            virtual ~FlagPickup(); //!< Destructor.
-
-            virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a FlagPickup object through XML.
-
-            virtual void tick(float dt);
-
+    public:
+        
+        FlagPickup(BaseObject* creator); //!< Constructor.
+        ~FlagPickup(); //!< Destructor.
+        
+        virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a FlagPickup object through XML.
+        
+        virtual void tick(float dt);
+        
             const int getFlagType(void) const; //!< Get the flag type of this pickup.
             
                 inline bool isPickedUp() const
-                        { return this->bPickedUp_; }
+        { return this->bPickedUp_; }
                 inline Pawn* pickedUpBy() const
-                        { return this->pickedUpBy_; }
-                        
+        { return this->pickedUpBy_; }
+        
                 inline void setPickedUp(bool pickedUp)
                 { this->bPickedUp_ = pickedUp; }
@@ -79 +79 @@
                 inline void ignorePickedUp()
                 { this->Pickupable::destroy(); }
-                        
+        
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-
-        protected:
-            void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
-
-            /**
-            @brief Set the flag type of this pickup.
-            @param type The type of this pickup as an enum.
-            */
-            inline void setFlagTypeDirect(int type)
-                { this->flagType_ = type; }
-            void setFlagType(int type); //!< Set the type of the FlagPickup.
-
-        private:
-            Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-            void initialize(void); //!< Initializes the member variables.
-            Pawn* pickedUpBy_;
-                        int flagType_;
-                        
-                        bool bPickedUp_;
-                        
+        
+    protected:
+        void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
+        
+        /**
+         @brief Set the flag type of this pickup.
+         @param type The type of this pickup as an enum.
+         */
+        inline void setFlagTypeDirect(int type)
+        { this->flagType_ = type; }
+        
+        void setFlagType(int type); //!< Set the type of the FlagPickup.
+        
+    private:
+        Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
+        void initialize(void); //!< Initializes the member variables.
+        Pawn* pickedUpBy_;
+        int flagType_;
+        
+        bool bPickedUp_;
+        
     };
 }