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

Timestamp:

Dec 3, 2008, 4:07:49 PM (15 years ago)

Author:

dsommer

Message:

Aufnehmen von festen Item und wieder ablegen

File:

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

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

@@ -42 +42 @@
                         {
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
-                        this->setSpeedBoost(ship);
-                        if(duration_==0)
-                        addTo(player);
-                        return true;
+                        if(duration_==0 )
+                        {       if(addTo(player))
+                                        {
+                                                this->setSpeedBoost(ship);
+                                                return true;
+                                        }
+                        }
+                        else
+                        {
+                                this->setSpeedBoost(ship);
+                                return true;
+                        }
+                        return false;
                         }
                 return false;
@@ -79 +88 @@
                 if (this->duration_ == 0)
                 {
+                        COUT(0) << "dropped" << std::endl;
                         if(remove(player)==true);
                         {