Changeset 6499

Timestamp:

Mar 9, 2010, 11:06:08 PM (14 years ago)

Author:

dafrick

Message:

Some small changes regarding output.

Location:

code/branches/pickup3/src

Files:

• modules/pickup/Pickup.cc (modified) (1 diff)
• modules/pickup/PickupSpawner.cc (modified) (1 diff)
• modules/pickup/items/HealthPickup.cc (modified) (1 diff)
• orxonox/pickup/PickupIdentifier.cc (modified) (1 diff)

code/branches/pickup3/src/modules/pickup/Pickup.cc

@@ -188 +188 @@
         SUPER(Pickup, changedCarrier);
         
-        COUT(1) << "Changed Carrier: " << this->isPickedUp() << this->isImmediate() << std::endl;
         //! Sets the Pickup to used if the Pickup has activation type 'immediate' and gets picked up.
         if(this->getCarrier() != NULL && this->isPickedUp() && this->isImmediate())

code/branches/pickup3/src/modules/pickup/PickupSpawner.cc

@@ -272 +272 @@
     void PickupSpawner::trigger(Pawn* pawn)
     {
-        COUT(1) << "PickupSpawner triggered." << std::endl;
         if (this->isActive()) //!< Checks whether PickupSpawner is active.
         {
-            COUT(1) << "PickupSpawner triggered and active." << std::endl;
+            COUT(3) << "PickupSpawner triggered and active." << std::endl;
             
             PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);

code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc

@@ -325 +325 @@
     void HealthPickup::setHealth(float health)
     {
-        if(health > 0.0f)
+        if(health >= 0.0f)
         {
             this->health_ = health;

code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc

@@ -105 +105 @@
         if(!(this->parameters_.find(name) == this->parameters_.end()))
         {
-            COUT(2) << "Request for adding a parameter that already exists for the PickupIdentififer was denied. name: '" << name << "', value: '" << value << "'."<<  std::endl;
+            COUT(4) << "Request for adding a parameter that already exists for the PickupIdentififer was denied. name: '" << name << "', value: '" << value << "'."<<  std::endl;
             return false;
         }