Changeset 9290 for code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc

Timestamp:

Jun 10, 2012, 11:01:40 PM (12 years ago)

Author:

landauf

Message:

Fixed crash with MSVC if a PickupCollection was used
A depleted CollectiblePickup is now destroyed instead of being dropped
A destroyed CollectiblePickup removes itself from the PickupCollection
PickupCollection has to use a list instead of a vector because of this reason
Also PickupCollectionIdentifier needed to be changed because the number of pickups in a collection may now change
Probably also fixed a bug in PickupCollectionIdentifier::compare() because it2 was not incremented

not completely clean yet

File:

• code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (modified) (4 diffs)

code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc

@@ -35 +35 @@
 
 #include "PickupCollectionIdentifier.h"
+#include "PickupCollection.h"
 
 namespace orxonox
@@ -43 +44 @@
         Constructor. Registers the object.
     */
-    PickupCollectionIdentifier::PickupCollectionIdentifier(Pickupable* pickup) : PickupIdentifier(pickup)
+    PickupCollectionIdentifier::PickupCollectionIdentifier(PickupCollection* collection) : PickupIdentifier(collection)
     {
         RegisterObject(PickupCollectionIdentifier);
+
+        this->collection_ = collection;
     }
 
@@ -80 +83 @@
 
         // If the number of Pickupables each of the two PickupCollectionIdentifiers contain differ, the one with less is considered smaller.
-        if(this->identifiers_.size() != collectionIdentifier->identifiers_.size())
-            return this->identifiers_.size()-collectionIdentifier->identifiers_.size();
+        if(this->collection_->getPickups().size() != collectionIdentifier->collection_->getPickups().size())
+            return this->collection_->getPickups().size()-collectionIdentifier->collection_->getPickups().size();
 
         // Compare the Pickupables of the two PickupCollectionIdentifiers one after the other. the one with the first 'smaller' one is considered smaller.
-        std::set<const PickupIdentifier*, PickupIdentifierCompare>::const_iterator it2 = collectionIdentifier->identifiers_.begin();
-        for(std::set<const PickupIdentifier*, PickupIdentifierCompare>::const_iterator it = this->identifiers_.begin(); it != this->identifiers_.end(); it++)
+        std::list<CollectiblePickup*>::const_iterator it1 = this->collection_->getPickups().begin();
+        std::list<CollectiblePickup*>::const_iterator it2 = collectionIdentifier->collection_->getPickups().begin();
+        for( ; it1 != this->collection_->getPickups().end(); ++it1, ++it2)
         {
+            const PickupIdentifier* id1 = (*it1)->getPickupIdentifier();
+            const PickupIdentifier* id2 = (*it2)->getPickupIdentifier();
 
-            if((*it)->compare(*it2) < 0)
+            if(id1->compare(id2) < 0)
                 return -1;
-            if((*it2)->compare(*it) < 0)
+            if(id2->compare(id1) < 0)
                 return 1;
         }
@@ -98 +104 @@
     }
 
-    /**
-    @brief
-        Add a Pickupable to the PickupCollectionIdentifier.
-    @param identifier
-        A pointer to the PickupIdentifier of the Pickupable to be added.
-    */
-    void PickupCollectionIdentifier::addPickup(const PickupIdentifier* identifier)
-    {
-        this->identifiers_.insert(identifier);
-    }
-
 }