Changeset 9272 for code/branches/presentation2012merge/src/modules/pickup/items

Timestamp:

Jun 3, 2012, 6:05:24 PM (12 years ago)

Author:

landauf

Message:

replaced tabs with spaces (no code changed)

Location:

code/branches/presentation2012merge/src/modules/pickup/items

Files:

• DamageBoostPickup.cc (modified) (2 diffs)
• DamageBoostPickup.h (modified) (2 diffs)

code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc

@@ -70 +70 @@
     void DamageBoostPickup::initialize(void)
     {
-        this->duration_ = 0.0f;
-        this->damageMultiplier_ = 1.0f; //The default damage multiplier.
+        this->duration_ = 0.0f;
+        this->damageMultiplier_ = 1.0f; //The default damage multiplier.
         //Defines who is allowed to pick up the pickup.
         this->addTarget(ClassIdentifier<SpaceShip>::getIdentifier());
@@ -130 +130 @@
         SpaceShip* ship = this->carrierToSpaceShipHelper();
         if(ship == NULL) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed.
-                this->Pickupable::destroy();
+            this->Pickupable::destroy();
 
 

code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h

@@ -57 +57 @@
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
-            /**
+            /**
             @brief Get the time the DamagePickup lasts.
             @return Returns the time in seconds the DamagePickup lasts.
@@ -95 +95 @@
 
             Timer durationTimer_; //!< Timer.
-            float duration_; //! Duration of damage boost.
+            float duration_; //! Duration of damage boost.
 
     };