Changeset 8864 for code/trunk/src/orxonox/pickup

Timestamp:

Aug 24, 2011, 2:57:53 PM (13 years ago)

Author:

dafrick

Message:

Improving output.

File:

• code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) (3 diffs)

code/trunk/src/orxonox/pickup/PickupIdentifier.cc

@@ -75 +75 @@
         assert(this->pickup_);
 
-        // If the classIdentifiers are not the same (meaning the PickupIdentifiers identify different classes), the obviously the two Pickupables identified by the PickupIdentifiers cannot be the same. An ordering is established through the alphabetical ordering of the respective classnames.
+        // If the classIdentifiers are not the same (meaning the PickupIdentifiers identify different classes), then obviously the two Pickupables identified by the PickupIdentifiers cannot be the same. An ordering is established through the alphabetical ordering of the respective classnames.
         if(!identifier->pickup_->getIdentifier()->isExactlyA(this->pickup_->getIdentifier()))
             return this->pickup_->getIdentifier()->getName().compare(identifier->pickup_->getIdentifier()->getName());
@@ -83 +83 @@
         if(!(this->parameters_.size() == identifier->parameters_.size()))
         {
-            orxout(internal_error, context::pickups) << "Something went wrong in PickupIdentifier!" << endl;
+            orxout(internal_error, context::pickups) << "Two PickupIdentifiers of the same Class have a different number of parameters. " << this->parameters_.size() << " vs. " << identifier->parameters_.size() << ". This indicates a bug in " << this->pickup_->getIdentifier()->getName() << "." << endl;
             return this->parameters_.size()-identifier->parameters_.size();
         }
@@ -93 +93 @@
             if(identifier->parameters_.find(it->first) == identifier->parameters_.end())
             {
-                orxout(internal_error, context::pickups) << "Something went wrong in PickupIdentifier!" << endl;
+                orxout(internal_error, context::pickups) << this->pickup_->getIdentifier()->getName() <<  " Something went wrong in PickupIdentifier!" << endl;
                 return -1;
             }