Changeset 2500 for code/branches/presentation/src/orxonox/objects/pickup/Turbo.cc

Timestamp:

Dec 17, 2008, 8:00:43 AM (15 years ago)

Author:

landauf

Message:

merged pickups2 to presentation

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/Turbo.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc) (8 diffs, 1 prop)

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

@@ -8 +8 @@
 namespace orxonox
 {
-        
+
 
         CreateFactory(Turbo);
 
-        Turbo::Turbo(BaseObject* creator) : Item(creator)
+        Turbo::Turbo(BaseObject* creator) : BaseItem(creator)
         {
                 RegisterObject(Turbo);
@@ -33 +33 @@
         XMLPortParam(Turbo, "duration", setDuration, getDuration, xmlelement, mode);
         XMLPortParam(Turbo, "accboost", setAccBoost, getAccBoost, xmlelement, mode);
-        XMLPortParam(Turbo, "rotacc", setRotAcc, getRotAcc, xmlelement, mode);
-        
+        XMLPortParam(Turbo, "rotacc", setRotAcc, getRotAcc, xmlelement, mode);
     }
 
         bool Turbo::pickedUp(Pawn* player)
         {
-                
+
                 if(player-> isA(this->getPlayerBaseClass()))
                         {
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
                         if(duration_==0 )
-                        {       
+                        {
                                 if(addTo(player))
-                                {       
+                                {
                                                 COUT(3)<<"ITEM EQUIPPED"<<std::endl;
                                                 this->setSpeedBoost(ship);
@@ -63 +62 @@
 
         }
-        
-        
+
+
         void Turbo::unsetSpeedBoost(SpaceShip* ship)
         {
+/*
         ship->setMaxSpeed( ship->getMaxSpeed() - this->boost_);
         ship->setTransAcc( ship->getTransAcc()/this->accboost_);
@@ -73 +73 @@
         COUT(3)<<"BOOST UNSET"<<std::endl;
         COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
+*/
+        ship->setPermanentBoost(false);
         }
 
         void Turbo::setSpeedBoost(SpaceShip* ship)
         {
+/*
         COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
         ship->setMaxSpeed( ship->getMaxSpeed() + this->boost_);
@@ -82 +85 @@
         ship->setMaxRotation( ship->getMaxRotation()+this->rotacc_);
         ship->setRotAcc( ship->getRotAcc()+this->rotacc_);
+*/
+    ship->setPermanentBoost(true);
+    ship->setBoost(true);
+
         if( this->duration_ != 0)
         {
@@ -88 +95 @@
                 turbotimer_.setTimer(this->duration_, false, this, executor);
         }
-        COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
+//      COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
         }
         bool Turbo::dropped(Pawn* player)
@@ -99 +106 @@
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
                         this->unsetSpeedBoost(ship);
-                        }       
+                        }
                 }
                 return true;
         }
-        
+
 }
 /*<Template baseclass="Turbo" name=turboitem>
@@ -115 +122 @@
     </PickupSpawner>*/
 
-        
-        
-        
-        
+
+
+
+