Changeset 2289 for code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h

Timestamp:

Nov 26, 2008, 7:48:26 PM (15 years ago)

Author:

dsommer

Message:

Added ShipEquipment to Pawn and various funtions for it -not compiling, because private…

File:

• code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h (modified) (4 diffs)

code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h

@@ -3 +3 @@
 #define _ShipEquipment_H__
 #include <string>
-#include <multimap>
+#include <map>
+#include "Item.h"
 
 
@@ -11 +12 @@
 
 
+/*          std::map<std::itemtype, Item*> EQClasses;
+            EQClasses["jacke"] = 0;
+            Item* item = itemMap_["jacke"];
+
+           if (itemMap_["jacke"])
+           if (itemMap_.find("jacke") != itemMap_.end()) */
 namespace orxonox
 {
@@ -16 +23 @@
     {
         public:
-            void AddItem(Shipitem toAddItem);
-            void RemoveItem(Shipitem toRemoveItem);
-            bool CheckifValid(Shipitem toBeChecked);
-            int
+        inline int getSpace()
+        {
+        return Usable.size()+Trunk.size();
+        };
+
+//      const std::multimap<std::string, Item*>& getEquipment() const { return this->Equipment; }
 
         private:
             std::multimap<std::string, Item*> Equipment;
+            std::multimap<std::string, Item*> Usable;
+            std::multimap<std::string, Item*> Trunk;
     };
 }
@@ -39 +50 @@
 
 
-
-
-
-
 #endif