Changeset 9241 for code/branches/presentation2012/src/modules/pickup/items/FlagPickup.h

Timestamp:

May 24, 2012, 8:49:19 PM (12 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/items/FlagPickup.h (copied) (copied from code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h) (3 diffs)

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