Changeset 9290 for code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h

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/CollectiblePickup.h (modified) (2 diffs)

code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h

@@ -55 +55 @@
     class _PickupExport CollectiblePickup : public Pickupable
     {
+        friend class PickupCollection;
 
         public:
@@ -68 +69 @@
             */
             bool isInCollection(void) const
-                { return this->isInCollection_; }
-
-            bool addToCollection(PickupCollection* collection); //!< Adds this CollectiblePickup to the input PickupCollection.
-            bool removeFromCollection(void); //!< Removes this CollectiblePickup from its PickupCollection.
+                { return this->collection_ != NULL; }
 
             void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
 
-        protected:
-            virtual void preDestroy(void); //!< Is called by OrxonoxClass::destroy() before the object is actually destroyed.
-            virtual void destroyPickup(void); //!< Destroys a Pickupable.
+        private:
+            void wasAddedToCollection(PickupCollection* collection);
+            void wasRemovedFromCollection(void);
 
-        private:
-            bool isInCollection_; //!< True if the CollectiblePickup is in a PickupCollection.
             PickupCollection* collection_; //!< A pointer to the PickupCollection this CollectiblePickup is in.
-
     };
 }