[Orxonox-commit 1781] r6499 - in code/branches/pickup3/src: modules/pickup modules/pickup/items orxonox/pickup

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-03-09 23:06:08 +0100 (Tue, 09 Mar 2010)
New Revision: 6499

Modified:
   code/branches/pickup3/src/modules/pickup/Pickup.cc
   code/branches/pickup3/src/modules/pickup/PickupSpawner.cc
   code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc
   code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc
Log:
Some small changes regarding output.


Modified: code/branches/pickup3/src/modules/pickup/Pickup.cc
===================================================================
--- code/branches/pickup3/src/modules/pickup/Pickup.cc	2010-03-08 20:45:28 UTC (rev 6498)
+++ code/branches/pickup3/src/modules/pickup/Pickup.cc	2010-03-09 22:06:08 UTC (rev 6499)
@@ -187,7 +187,6 @@
     {
         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())
         {

Modified: code/branches/pickup3/src/modules/pickup/PickupSpawner.cc
===================================================================
--- code/branches/pickup3/src/modules/pickup/PickupSpawner.cc	2010-03-08 20:45:28 UTC (rev 6498)
+++ code/branches/pickup3/src/modules/pickup/PickupSpawner.cc	2010-03-09 22:06:08 UTC (rev 6499)
@@ -271,10 +271,9 @@
     //TODO: Make more generic -> without pawn.
     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);
             if(carrier == NULL)

Modified: code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc	2010-03-08 20:45:28 UTC (rev 6498)
+++ code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc	2010-03-09 22:06:08 UTC (rev 6499)
@@ -324,7 +324,7 @@
     */
     void HealthPickup::setHealth(float health)
     {
-        if(health > 0.0f)
+        if(health >= 0.0f)
         {
             this->health_ = health;
         }

Modified: code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc
===================================================================
--- code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc	2010-03-08 20:45:28 UTC (rev 6498)
+++ code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc	2010-03-09 22:06:08 UTC (rev 6499)
@@ -104,7 +104,7 @@
         
         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;
         }