Changeset 9232 for code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h

Timestamp:

May 23, 2012, 5:56:57 PM (13 years ago)

Author:

decapitb

Message:

safety checkin

Location:

code/branches/captureTheFlag

Files:

• . (modified) (1 prop)
• src/modules/pickup/items/FlagPickup.h (copied) (copied from code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h) (5 diffs)

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

@@ -37 +37 @@
 
 #include "pickup/PickupPrereqs.h"
+#include "worldentities/pawns/Pawn.h"
 
 #include <string>
@@ -42 +43 @@
 #include "pickup/Pickup.h"
 #include "tools/Timer.h"
+#include "tools/interfaces/Tickable.h"
 
 
@@ -47 +49 @@
 /*
     @ingroup PickupItems
-    */
-    namespace pickupFlagType
-    {
-        enum Value
-        {
-            blue, //!< Means that the @ref orxonox::FlagPickup "FlagPickup" is the flag of the blue team.
-            red, //!< Means that the @ref orxonox::FlagPickup "FlagPickup" is the flag of the red team.
-                neutral //!< Means that the @ref orxonox::FlagPickup "FlagPickup" is a neutral flag.
-        };
-    }
-
-    /**
+    
 
     @author
@@ -76 +67 @@
             virtual void tick(float dt);
 
-            const std::string& getFlagType(void) const; //!< Get the flag type of this pickup.
-
-        int teamScore_;
-
+            const int getFlagType(void) const; //!< Get the flag type of this pickup.
+            
+                inline bool isPickedUp() const
+                        { return this->bPickedUp_; }
+                inline Pawn* pickedUpBy() const
+                        { return this->pickedUpBy_; }
+                        
+                inline void setPickedUp(bool pickedUp)
+                { this->bPickedUp_ = pickedUp; }
+                
+                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.
 
@@ -89 +89 @@
             @param type The type of this pickup as an enum.
             */
-            inline void setFlagTypeDirect(pickupFlagType::Value type)
+            inline void setFlagTypeDirect(int type)
                 { this->flagType_ = type; }
-            void setFlagType(std::string type); //!< Set the type of the FlagPickup.
+            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.
-            int getTeam(PlayerInfo* player);
             void initialize(void); //!< Initializes the member variables.
-
-            pickupFlagType::Value flagType_; //!< The type of the FlagPickup.
-
-
-            //! Strings for the flag types.
-            static const std::string flagTypeBlue_s;
-            static const std::string flagTypeRed_s;
-                static const std::string flagTypeNeutral_s;
-
+            Pawn* pickedUpBy_;
+                        int flagType_;
+                        
+                        bool bPickedUp_;
+                        
     };
 }