Changeset 7127 for code/branches/presentation3/src/modules/pickup/PickupSpawner.cc

Timestamp:

Jun 9, 2010, 9:32:58 PM (14 years ago)

Author:

rgrieder

Message:

Removed excess white space at the end of lines.

File:

• code/branches/presentation3/src/modules/pickup/PickupSpawner.cc (modified) (18 diffs)

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

@@ -55 +55 @@
     {
         RegisterObject(PickupSpawner);
-        
+
         this->initialize();
     }
@@ -76 +76 @@
     {
         RegisterObject(PickupSpawner);
-        
+
         this->initialize();
-  
+
         this->pickup_ = pickup;
 
@@ -84 +84 @@
         this->respawnTime_ = respawnTime;
         this->setMaxSpawnedItems(maxSpawnedItems);
-        
+
         if(this->pickup_ == NULL)
         {
@@ -132 +132 @@
 
         XMLPortObject(PickupSpawner, Pickupable, "pickup", setPickupable, getPickupable, xmlelement, mode);
-        
+
         XMLPortParam(PickupSpawner, "triggerDistance", setTriggerDistance, getTriggerDistance, xmlelement, mode);
         XMLPortParam(PickupSpawner, "respawnTime", setRespawnTime, getRespawnTime, xmlelement, mode);
         XMLPortParam(PickupSpawner, "maxSpawnedItems", setMaxSpawnedItems, getMaxSpawnedItems, xmlelement, mode);
-        
+
         if(this->pickup_ == NULL)
         {
@@ -150 +150 @@
         }
     }
-    
+
     /**
     @brief
@@ -161 +161 @@
         this->setVisible(this->isActive());
     }
-     
+
     /**
     @brief
@@ -172 +172 @@
     {
         SUPER(PickupSpawner, tick, dt);
-        
+
         //! If the PickupSpawner is active.
         if (this->isActive())
         {
             SmartPtr<PickupSpawner> temp = this; // create a smart pointer to keep the PickupSpawner alive until we iterated through all Pawns (in case a Pawn takes the last pickup)
-            
+
             //! Iterate trough all Pawns.
             for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
@@ -191 +191 @@
         }
     }
-    
+
     /**
     @brief
@@ -203 +203 @@
         this->spawnsRemaining_ = items;
     }
-    
+
     /**
     @brief
@@ -230 +230 @@
         }
     }
-    
+
     /**
     @brief
@@ -239 +239 @@
         this->respawnTimer_.setTimer(this->respawnTime_, false, createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback, this)));
     }
-    
+
     /**
     @brief
@@ -258 +258 @@
             return;
         }
-        
+
         this->pickup_ = pickup;
     }
-    
+
     /**
     @brief
@@ -285 +285 @@
         {
             COUT(4) << "PickupSpawner (&" << this << ") triggered and active." << std::endl;
-            
+
             PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
             if(carrier == NULL)
@@ -292 +292 @@
                 return;
             }
-            
+
             if(!carrier->isTarget(this->pickup_))
             {
@@ -298 +298 @@
                 return;
             }
-            
+
             PickupCarrier* target = carrier->getTarget(this->pickup_);
             Pickupable* pickup = this->getPickup();
-            
+
             if(target != NULL && pickup != NULL)
             {
@@ -317 +317 @@
                 if(target == NULL)
                     COUT(1) << "PickupSpawner (&" << this << "): Pickupable has no target." << std::endl;
-                
+
                 if(pickup == NULL)
                 {
@@ -335 +335 @@
     @return
         The Pickupable created.
-    */    
+    */
     Pickupable* PickupSpawner::getPickup(void)
     {
@@ -343 +343 @@
             return NULL;
         }
-        
+
         Pickupable* pickup = this->pickup_->clone();
         return pickup;