Changeset 2342

Timestamp:

Dec 4, 2008, 1:20:58 PM (16 years ago)

Author:

dsommer

Message:

kleinigkeiten an checkSlot usw.

Location:

code/branches/pickups2/src/orxonox/objects/pickup

Files:

• Item.cc (modified) (2 diffs)
• PickupSpawner.h (modified) (4 diffs)
• ShipEquipment.cc (modified) (3 diffs)
• ShipEquipment.h (modified) (2 diffs)

code/branches/pickups2/src/orxonox/objects/pickup/Item.cc

@@ -31 +31 @@
 bool Item::addTo (Pawn* player)
 {
-        
+
         return player->getPickUp().insert(this);
         /*if(checkSlot(player)==true)
@@ -53 +53 @@
 bool Item::checkSlot(Pawn* player)
 {
-        std::multimap<std::string,Item*>::iterator it;
+        /*std::multimap<std::string,Item*>::iterator it;
         for ( it=player->getPickUp().getEquipment().begin() ; it != player->getPickUp().getEquipment().end(); it++ )
         {
         if((*it).second->playerBaseClass_==this->playerBaseClass_)
+                //das isch schmarre...machs mit isExactlyA(...)
         return false;
         }
-        return true;
-        //return player->getPickUp().checkSlot(player);
+        return true;*/
+        return player->getPickUp().checkSlot(this);
 }
 void Item::setPlayerBaseClassName(const std::string& name)

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

@@ -18 +18 @@
         virtual void tick(float dt);
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+    virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
         virtual void triggering(Pawn* trigger); // Wenn ein Spieler in die Naehe kommt
 
@@ -29 +29 @@
         inline float getDistance() const
                 { return this->distance_; }
-        
+
         private:
         std::string itemtemplate_;
@@ -38 +38 @@
 
 #endif /* _PickupSpawner_H__ */
-        
 
 
@@ -55 +54 @@
 
 
+

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

@@ -16 +16 @@
                 COUT(3) << "swap?" << std::endl;
                 return false;
-        
+
         return false;
         };
@@ -24 +24 @@
         if(it != Equipment.end())
         {
-                //it->second->dropped(this->getPlayer());
                 Equipment.erase (it);
                 return true;
         }
-        else
-                return false;
+        return false;
         };
+        /*void print(std::multimap<std::string, Item*> eut)
+        {
+                std::multimap<std::string,Item*>::iterator it;
+                COUT(3) << "Liste:" <<  endl;
+                for ( it=eut.begin() ; it != eut.end(); ++it )
+                    COUT(3) << (*it).first << endl;
 
+        }*/
         void ShipEquipment::eraseAll()
         {
-                
+                //print(Equipment);
                 for (std::multimap<std::string,Item*>::iterator it = Equipment.begin(); it != Equipment.end(); )
                 {
-                
+
                         (it++)->second->dropped(this->getPlayer());
                 }
+                //print(Equipment);
         }
 
@@ -47 +53 @@
         for ( it= getPlayer()->getPickUp().getEquipment().begin() ; it != getPlayer()->getPickUp().getEquipment().end(); it++ )
         {
-                if((*it).second->getPlayerBaseClass()==item->getPlayerBaseClass())
+                //if((*it).second->getPlayerBaseClass()==item->getPlayerBaseClass())
+                if(item->isExactlyA((*it).second->getIdentifier()))
                 return false;
         }

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

@@ -28 +28 @@
         bool insert(Item* item);
         bool erase (Item* item);
+        //void print(std::multimap<std::string, Item*> eut);
         void eraseAll();
         bool checkSlot(Item* item);
@@ -37 +38 @@
         inline void setPlayer(Pawn* setplayer)
         {this->player = setplayer;}
-
         private:
             Pawn* player;