Changeset 2662 for code/trunk/src/orxonox/objects/pickup

Timestamp:

Feb 14, 2009, 10:17:35 PM (16 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/BaseItem.cc (copied) (copied from code/branches/presentation/src/orxonox/objects/pickup/BaseItem.cc)
• src/orxonox/objects/pickup/BaseItem.h (copied) (copied from code/branches/presentation/src/orxonox/objects/pickup/BaseItem.h)
• src/orxonox/objects/pickup/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/pickup/PickupSpawner.cc (copied) (copied from code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.cc)
• src/orxonox/objects/pickup/PickupSpawner.h (copied) (copied from code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.h)
• src/orxonox/objects/pickup/ShipEquipment.cc (copied) (copied from code/branches/presentation/src/orxonox/objects/pickup/ShipEquipment.cc)
• src/orxonox/objects/pickup/ShipEquipment.h (modified) (2 diffs)
• src/orxonox/objects/pickup/ShipEquipmentClasses.cc (modified) (3 diffs)
• src/orxonox/objects/pickup/ShipEquipmentClasses.h (modified) (2 diffs)
• src/orxonox/objects/pickup/ShipItem.cc (modified) (1 diff)
• src/orxonox/objects/pickup/ShipItem.h (modified) (3 diffs)
• src/orxonox/objects/pickup/Turbo.cc (copied) (copied from code/branches/presentation/src/orxonox/objects/pickup/Turbo.cc)
• src/orxonox/objects/pickup/Turbo.h (copied) (copied from code/branches/presentation/src/orxonox/objects/pickup/Turbo.h)
• src/orxonox/objects/pickup/Usable.h (modified) (1 prop)

code/trunk/src/orxonox/objects/pickup/CMakeLists.txt

@@ -1 +1 @@
 SET( SRC_FILES
-  ShipEquipmentClasses.cc
-  ShipItem.cc
+  PickupSpawner.cc
+  BaseItem.cc
+  Turbo.cc
+  ShipEquipment.cc
 )
 

code/trunk/src/orxonox/objects/pickup/ShipEquipment.h

@@ -1 @@
-
 #ifndef _ShipEquipment_H__
 #define _ShipEquipment_H__
 #include <string>
-#include <multimap>
+#include <map>
+
+/*
+multimap<std::string, BaseItem*> equipment_;
+equipment_.insert(pair<std::string, BaseItem*>("Weapon", new BaseItem()));*/
 
 
-/*
-multimap<std::string, Item*> equipment_;
-equipment_.insert(pair<std::string, Item*>("Weapon", new Item()));*/
+/*          std::map<std::itemtype, BaseItem*> EQClasses;
+            EQClasses["jacke"] = 0;
+            BaseItem* item = itemMap_["jacke"];
 
-
+           if (itemMap_["jacke"])
+           if (itemMap_.find("jacke") != itemMap_.end()) */
 namespace orxonox
 {
+    class BaseItem;
+/**
+@brief
+    ShipEquipment is the inventory of a player. It's part of the Pawn class.
+
+*/
     class _OrxonoxExport ShipEquipment
     {
         public:
-            void AddItem(Shipitem toAddItem);
-            void RemoveItem(Shipitem toRemoveItem);
-            bool CheckifValid(Shipitem toBeChecked);
-            int
-
+        inline int getSpace()
+        {
+        return Usable.size()+Trunk.size();
+        };
+        bool insert(BaseItem* item);
+        bool erase (BaseItem* item);
+        //void print(std::multimap<std::string, BaseItem*> eut);
+        void eraseAll();
+        //bool checkSlot(BaseItem* item);
+        BaseItem* checkSlot(BaseItem* item);
+//      const std::multimap<std::string, BaseItem*>& getEquipment() const { return this->Equipment; }
+        inline std::multimap<std::string, BaseItem*>& getEquipment() {return this->Equipment;}
+        inline std::multimap<std::string, BaseItem*>& getUsable() {return this->Usable;}
+        inline std::multimap<std::string, BaseItem*>& getTrunk() {return this->Trunk;}
+        inline Pawn* getPlayer() {return this->player ;}
+        inline void setPlayer(Pawn* setplayer)
+        {this->player = setplayer;}
         private:
-            std::multimap<std::string, Item*> Equipment;
+            Pawn* player;//!< Is a pointer to the belonging player
+            std::multimap<std::string, BaseItem*> Equipment;//!< the Equipment for permanent Items
+            std::multimap<std::string, BaseItem*> Usable;//!< Where Usables are stored
+            std::multimap<std::string, BaseItem*> Trunk;//!< Every other Item is stored here
     };
 }
@@ -39 +64 @@
 
 
-
-
-
-
 #endif

code/trunk/src/orxonox/objects/pickup/ShipEquipmentClasses.cc

@@ -57 +57 @@
                 }
                 break;
-            default:;
             }
         case Useable:
             return CheckifSpace();
-        case default:;
         }
         return true;
@@ -67 +65 @@
 
     /*Adds the Item to the Ship*/
-    void ShipEquipment::AddItem(Shipitem* toAddItem)
+    void ShipEquipment::AddItem(ShipItem* toAddItem)
     {
         if(CheckifValid(toAddItem)==true)
@@ -90 +88 @@
         }
     }
+
+    /*Adds the Item to the Ship*/
+    void ShipEquipment::AddItem(Shipitem* toAddItem)
+    {
+        if(CheckifValid(toAddItem)==true)
+        {
+            switch(toAddItem.CheckType()){
+                case Permanent:
+                    Equipment.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
+                    break;
+                case Usable:
+                    Usable.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
+                    break;
+                case Trunk:
+                    Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
+                    break;
+            }
+        }
+        else if(toAddItem.CheckType()==Permanent)
+        {
+            if(CheckifSpace()==true)
+                Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
+        }
+    }
+
+    void ShipEquipment::SwitchItem(Permanent* toSwitchItem)
+    {
+        multimap<string, ShipItem*>::iterator it;
+        string equippedname;
+        equippedname=GetNameofPermanent(toSwitchItem.CheckSubType());
+        it=Equipment.find(equippedname);
+        Trunk.insert (find(equippedname));
+        Equipment.erase (it);
+        Equipment.insert(pair<std::string, ShipItem*>(toSwitchItem.itemname,toSwitchItem)
+    }
+
+    string ShipEquipment::GetNameofPermanent (subItemTypePermanent NametoGet)
+    {
+        multimap<string, ShipItem*>::iterator it;
+        for ( it=Equipment.begin() ; it != Equipment.end(); it++ ){
+            if((*it).second->CheckSubType()==NametoGet){
+                return (*it).first.itemname;
+            }
+        }
+        return 0;
+    }
 }

code/trunk/src/orxonox/objects/pickup/ShipEquipmentClasses.h

@@ -8 +8 @@
 
 /*
-multimap<std::string, Item*> equipment_;
-equipment_.insert(pair<std::string, Item*>("Weapon", new Item()));*/
+multimap<std::string, BaseItem*> equipment_;
+equipment_.insert(pair<std::string, BaseItem*>("Weapon", new BaseItem()));*/
 
 
-/*          std::map<std::itemtype, Item*> EQClasses;
+/*          std::map<std::itemtype, BaseItem*> EQClasses;
             EQClasses["jacke"] = 0;
-            Item* item = itemMap_["jacke"];
+            BaseItem* item = itemMap_["jacke"];
 
            if (itemMap_["jacke"])
@@ -23 +23 @@
     {
         public:
-            void AddItem(Shipitem* toAddItem);
+            /*void AddItem(Shipitem* toAddItem);
             void RemoveItem(Shipitem* toRemoveItem);
             bool CheckifValid(Shipitem* toBeChecked);
             bool CheckifSpace();
+            void SwitchItem(Permanent* toSwitchItem);
+            string GetNameofPermanent (subItemTypePermanent NametoGet);*/ //holt den Namen des getragenen Items im jeweiligen Slot.
 
         private:
-            multimap<std::string, ShipItem*> Equipment;
-            multimap<std::string, ShipItem*> Usable;
-            multimap<std::string, ShipItem*> Trunk;
+            multimap<std::string, BaseItem*> Equipment;
+            multimap<std::string, BaseItem*> Usable;
+            multimap<std::string, BaseItem*> Trunk;
     };
 }

code/trunk/src/orxonox/objects/pickup/ShipItem.cc

@@ -5 +5 @@
     itemtype ShipItem::CheckType()
     {
-        return this.type;
+        return this->type;
     }
 
     subItemTypePermanent CheckSubType()
     {
-        return this.subtype_permanent;
+        return this->subtype_permanent;
     }
+
+    subItemTypePowerups CheckSubType()
+    {
+        return this->subtype_powerups;
+    }
+    subItemTypeUsable CheckSubType()
+    {
+        return this->subtype_usables;
+    }
+
 }

code/trunk/src/orxonox/objects/pickup/ShipItem.h

@@ -21 +21 @@
         public:
             itemType CheckType();
-            virtual
+            //virtual ChecksubType();
 
         private:
@@ -27 +27 @@
             string itemname;
     };
-
 
     /* Useables are Items the Player can choose when to activate and then show an instant action/effect
@@ -37 +36 @@
             Rockets,
             Repairkits,
-            Triggers,           //trigger events usable by the player (Quests f.exp.)
+            Triggers,       //trigger events usable by the player (Quests f.exp.)
             Boosters,
             Shields,