Changeset 2397 for code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc

Timestamp:

Dec 10, 2008, 8:24:53 PM (16 years ago)

Author:

dsommer

Message:

teilweise doxy geaddet und weitere test instanzen

File:

• code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc (modified) (3 diffs)

code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc

@@ -43 +43 @@
                         {
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
-                        COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
                         if(duration_==0 )
-                        {       if(addTo(player))
-                                        {       
+                        {       
+                                if(addTo(player))
+                                {       
                                                 COUT(3)<<"ITEM EQUIPPED"<<std::endl;
                                                 this->setSpeedBoost(ship);
-                                                COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
                                                 return true;
-                                        }
+                                }
+                                return false;
                         }
                         else
                         {
                                 this->setSpeedBoost(ship);
-                                COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
                                 return true;
                         }
@@ -73 +72 @@
         ship->setRotAcc( ship->getRotAcc()-this->rotacc_);
         COUT(3)<<"BOOST UNSET"<<std::endl;
+        COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
         }
 
         void Turbo::setSpeedBoost(SpaceShip* ship)
         {
+        COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
         ship->setMaxSpeed( ship->getMaxSpeed() + this->boost_);
         ship->setTransAcc( ship->getTransAcc()*this->accboost_);
@@ -87 +88 @@
                 turbotimer_.setTimer(this->duration_, false, this, executor);
         }
-        
+        COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
         }
         bool Turbo::dropped(Pawn* player)