Changeset 6475 for code/branches/pickup3/src/modules/pickup/PickupCollection.h

Timestamp:

Mar 5, 2010, 6:26:54 PM (14 years ago)

Author:

dafrick

Message:

Additional documentation, code niceifying and potential bug fixing. Also: Renamed DroppedItem to DroppedPickup.

File:

• code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified) (3 diffs)

code/branches/pickup3/src/modules/pickup/PickupCollection.h

@@ -36 +36 @@
 #include "core/XMLPort.h"
 
-#include "PickupCollectionIdentifier.h"
-
 #include <list>
 
@@ -66 +64 @@
             virtual void clone(OrxonoxClass* item);
             
-            virtual const PickupIdentifier* getPickupIdentifier(void)
-                { return &this->pickupCollectionIdentifier_; }
+            virtual const PickupIdentifier* getPickupIdentifier(void);
             
             bool addPickupable(Pickupable* pickup);
@@ -75 +72 @@
             void initializeIdentifier(void);
             
-            PickupCollectionIdentifier pickupCollectionIdentifier_;
+            virtual bool createSpawner(const Vector3& position); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+            
+            PickupCollectionIdentifier* pickupCollectionIdentifier_;
             
         private: