Changeset 7494 for code/trunk/src/modules/pickup/PickupManager.cc

Timestamp:

Sep 28, 2010, 5:31:59 PM (14 years ago)

Author:

dafrick

Message:

Some documenting and cleaning up/re-organization in pickups module.

File:

• code/trunk/src/modules/pickup/PickupManager.cc (modified) (6 diffs)

code/trunk/src/modules/pickup/PickupManager.cc

@@ -21 +21 @@
  *
  *   Author:
- *      ...
+ *      Damian 'Mozork' Frick
  *   Co-authors:
  *      ...
@@ -100 +100 @@
     bool PickupManager::registerRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation)
     {
-        if(identifier == NULL || representation == NULL || this->representations_.find(identifier) != this->representations_.end()) //!< If the Pickupable already has a Representation registered.
+        assert(identifier);
+        assert(representation);
+
+        if(this->representations_.find(identifier) != this->representations_.end()) // If the Pickupable already has a Representation registered.
             return false;
 
         this->representations_[identifier] = representation;
 
-        COUT(4) << "PickupRepresentation " << representation << " registered with the PickupManager." << std::endl;
+        COUT(4) << "PickupRepresentation &" << representation << " registered with the PickupManager." << std::endl;
         return true;
     }
@@ -121 +124 @@
     bool PickupManager::unregisterRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation)
     {
-        if(identifier == NULL || representation == NULL)
-            return false;
+        assert(identifier);
+        assert(representation);
 
         std::map<const PickupIdentifier*, PickupRepresentation*, PickupIdentifierCompare>::iterator it = this->representations_.find(identifier);
@@ -130 +133 @@
         this->representations_.erase(it);
 
-        COUT(4) << "PickupRepresentation " << representation << " unregistered with the PickupManager." << std::endl;
+        COUT(4) << "PickupRepresentation &" << representation << " unregistered with the PickupManager." << std::endl;
         return true;
     }
@@ -167 +170 @@
         if(pickup != NULL)
             return this->getRepresentation(pickup->getPickupIdentifier());
-        
+
         return NULL;
     }
@@ -268 +271 @@
         if(pickup == NULL)
             return;
-        
+
         std::map<Pickupable*, WeakPtr<Pickupable> >::iterator it = this->pickupsList_.find(pickup); // Get the WeakPointer of the Pickupable.
         // If either the input Pickupable is not in the PickupManagers list or it no longer exists, the method returns.