Changeset 8864 for code/trunk

Timestamp:

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

Author:

dafrick

Message:

Improving output.

Location:

code/trunk/src

Files:

• modules/pickup/Pickup.cc (modified) (2 diffs)
• modules/pickup/items/HealthPickup.cc (modified) (10 diffs)
• orxonox/pickup/PickupIdentifier.cc (modified) (3 diffs)

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

@@ -159 +159 @@
     void Pickup::setActivationType(const std::string& type)
     {
-        if(Pickup::activationTypeImmediate_s.compare(type) == 0)
-        {
+        if(type == Pickup::activationTypeImmediate_s)
             this->activationType_ = pickupActivationType::immediate;
-        }
-        else if(Pickup::activationTypeOnUse_s.compare(type) == 0)
-        {
+        else if(type == Pickup::activationTypeOnUse_s)
             this->activationType_ = pickupActivationType::onUse;
-        }
         else
-        {
-            orxout(internal_error, context::pickups) << "Invalid activationType '" << type << "' in pickup." << endl;
-        }
+            orxout(internal_error, context::pickups) << "Invalid activationType '" << type << "' in " << this->getIdentifier()->getName() << "." << endl;
     }
 
@@ -181 +175 @@
     void Pickup::setDurationType(const std::string& type)
     {
-        if(Pickup::durationTypeOnce_s.compare(type) == 0)
-        {
+        if(type == Pickup::durationTypeOnce_s)
             this->durationType_ = pickupDurationType::once;
-        }
-        else if(Pickup::durationTypeContinuous_s.compare(type) == 0)
-        {
+        else if(type == Pickup::durationTypeContinuous_s)
             this->durationType_ = pickupDurationType::continuous;
-        }
         else
-        {
-            orxout(internal_error, context::pickups) << "Invalid durationType '" << type << "' in pickup." << endl;
-        }
+            orxout(internal_error, context::pickups) << "Invalid durationType '" << type << "' in " << this->getIdentifier()->getName() << "." << endl;
     }
 

code/trunk/src/modules/pickup/items/HealthPickup.cc

@@ -76 +76 @@
     void HealthPickup::initialize(void)
     {
-        this->health_ = 0;
-        this->healthRate_ = 0;
+        this->health_ = 0.0f;
+        this->healthRate_ = 0.0f;
         this->healthType_ = pickupHealthType::limited;
-        this->maxHealthSave_ = 0;
-        this->maxHealthOverwrite_ = 0;
+        this->maxHealthSave_ = 0.0f;
+        this->maxHealthOverwrite_ = 0.0f;
 
         this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
@@ -121 +121 @@
 
         if(!this->isContinuous())
-            this->healthRate_ = 0.0;
+            this->healthRate_ = 0.0f;
 
         this->initializeIdentifier();
@@ -173 +173 @@
 
             // If all health has been transferred.
-            if(this->getHealth() == 0)
+            if(this->getHealth() == 0.0f)
             {
                 this->setUsed(false);
@@ -197 +197 @@
                     this->Pickupable::destroy();
 
-                float health = 0;
+                float health = 0.0f;
                 switch(this->getHealthTypeDirect())
                 {
@@ -234 +234 @@
                 if(pawn == NULL)
                 {
-                    orxout(internal_error, context::pickups) << "Something went horribly wrong in Health Pickup. PickupCarrier is no Pawn." << endl;
+                    orxout(internal_error, context::pickups) << "Something went horribly wrong in Health Pickup. PickupCarrier is '" << carrier->getIdentifier()->getName() << "' instead of Pawn." << endl;
                     this->Pickupable::destroy();
                     return;
@@ -248 +248 @@
 
             // If either the pickup can only be used once or it is continuous and used up, it is destroyed upon setting it to unused.
-            if(this->isOnce() || (this->isContinuous() && this->getHealth() == 0))
+            if(this->isOnce() || (this->isContinuous() && this->getHealth() == 0.0f))
             {
                 this->Pickupable::destroy();
@@ -267 +267 @@
 
         if(pawn == NULL)
-        {
             orxout(internal_error, context::pickups) << "Invalid PickupCarrier in HealthPickup." << endl;
-        }
 
         return pawn;
@@ -326 +324 @@
     {
         if(health >= 0.0f)
-        {
             this->health_ = health;
-        }
         else
         {
-            orxout(internal_error, context::pickups) << "Invalid health in HealthPickup." << endl;
-            this->health_ = 0.0;
+            orxout(internal_error, context::pickups) << "Invalid health '" << health << "' in HealthPickup. The health must be non.negative." << endl;
+            this->health_ = 0.0f;
         }
     }
@@ -344 +340 @@
     void HealthPickup::setHealthRate(float rate)
     {
-        if(rate >= 0)
-        {
+        if(rate >= 0.0f)
             this->healthRate_ = rate;
-        }
         else
-        {
-            orxout(internal_error, context::pickups) << "Invalid healthSpeed in HealthPickup." << endl;
-        }
+            orxout(internal_error, context::pickups) << "Invalid healthRate '" << rate << "' in HealthPickup. The healthRate must be non-negative." << endl;
     }
 
@@ -363 +355 @@
     {
         if(type == HealthPickup::healthTypeLimited_s)
-        {
             this->setHealthTypeDirect(pickupHealthType::limited);
-        }
         else if(type == HealthPickup::healthTypeTemporary_s)
-        {
             this->setHealthTypeDirect(pickupHealthType::temporary);
-        }
         else if(type == HealthPickup::healthTypePermanent_s)
-        {
             this->setHealthTypeDirect(pickupHealthType::permanent);
-        }
         else
-        {
-            orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
-        }
+            orxout(internal_error, context::pickups) << "Invalid healthType '" << type << "' in HealthPickup." << endl;
     }
 

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;
             }