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

Timestamp:

Nov 26, 2008, 7:48:26 PM (15 years ago)

Author:

dsommer

Message:

Added ShipEquipment to Pawn and various funtions for it -not compiling, because private…

File:

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

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

@@ -19 +19 @@
                 this->duration_ = 0;
                 this->accboost_ = 1;
+                this->rotacc_= 0;
         }
 
@@ -32 +33 @@
         XMLPortParam(Turbo, "duration", setDuration, getDuration, xmlelement, mode);
         XMLPortParam(Turbo, "accboost", setAccBoost, getAccBoost, xmlelement, mode);
+        XMLPortParam(Turbo, "rotacc", setRotAcc, getRotAcc, xmlelement, mode);
+        
     }
 
@@ -53 +56 @@
         ship->setMaxSpeed( ship->getMaxSpeed() - this->boost_);
         ship->setTransAcc( ship->getTransAcc()/this->accboost_);
+        ship->setMaxRotation( ship->getMaxRotation()-this->rotacc_);
+        ship->setRotAcc( ship->getRotAcc()-this->rotacc_);
         COUT(3)<<"PickUp Timer expired"<<std::endl;
         }
@@ -60 +65 @@
         ship->setMaxSpeed( ship->getMaxSpeed() + this->boost_);
         ship->setTransAcc( ship->getTransAcc()*this->accboost_);
+        ship->setMaxRotation( ship->getMaxRotation()+this->rotacc_);
+        ship->setRotAcc( ship->getRotAcc()+this->rotacc_);
         if( this->duration_ != 0)
         {
@@ -72 +79 @@
                 if (this->duration_ == 0)
                 {
-                        //player->Equipment.erase ( std::pair<std::string, Item*>(this->itemname,this) );
+                        if(remove(player)==true);
+                        {
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
                         this->unsetSpeedBoost(ship);
+                        }       
                 }
                 return true;