[Orxonox-commit 1967] r6684 - code/branches/ppspickups2/src/modules/pickup/items

benedict at orxonox.net benedict at orxonox.net
Mon Apr 12 13:55:32 CEST 2010


Author: benedict
Date: 2010-04-12 13:55:31 +0200 (Mon, 12 Apr 2010)
New Revision: 6684

Modified:
   code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc
Log:
minor changes in intendation & commenting

Modified: code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc
===================================================================
--- code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc	2010-04-12 11:24:24 UTC (rev 6683)
+++ code/branches/ppspickups2/src/modules/pickup/items/InvisiblePickup.cc	2010-04-12 11:55:31 UTC (rev 6684)
@@ -44,8 +44,7 @@
 
 namespace orxonox
 {
-    
-    
+
     CreateFactory(InvisiblePickup);
     
     /**
@@ -86,9 +85,6 @@
 	this->duration_ = 0.0;
 	this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
     }
- 
-   
-    
 
     /**
     @brief
@@ -102,7 +98,6 @@
 	 this->initializeIdentifier();
     }
     
-    
     /**
     @brief
         Is called when the pickup has transited from used to unused or the other way around.
@@ -117,8 +112,8 @@
             return;
 	if (this->isUsed())
 	{
-	    this->setInvisible(true);
 	    this->startPickupTimer(this->getDuration());
+	    this->setInvisible(true);
 	}
 	else
 	  this->setInvisible(false);
@@ -161,10 +156,6 @@
 	pickup->initializeIdentifier();
     }
     
-    
-    
-    
-     
     /**
     @brief
         Sets the invisibility.
@@ -179,8 +170,6 @@
       return 0;
     }
     
-   
-    
     /**
     @brief
     Sets the duration.
@@ -200,9 +189,8 @@
 	}
     }
     
-    
-    
-    void InvisiblePickup::PickupTimerCallBack(void){
+    void InvisiblePickup::PickupTimerCallBack(void)
+    {
 	this->setInvisible(false);
     }
 




More information about the Orxonox-commit mailing list