Changeset 6643 for code/branches/ppspickups1/src/orxonox

Timestamp:

Mar 29, 2010, 4:39:25 PM (15 years ago)

Author:

ebeier

Message:

engine stripes now working correctly

Location:

code/branches/ppspickups1/src/orxonox

Files:

• interfaces/PickupCarrier.h (modified) (1 diff)
• items/Engine.h (modified) (1 diff)
• items/MultiStateEngine.cc (modified) (1 diff)

code/branches/ppspickups1/src/orxonox/interfaces/PickupCarrier.h

@@ -47 +47 @@
 namespace orxonox
 {
+    class Pickupable;
+    class Pickup;
+    class HealthPickup;
+    class MetaPickup;
+    class SpeedPickup;
 
     /**

code/branches/ppspickups1/src/orxonox/items/Engine.h

@@ -115 +115 @@
             virtual const Vector3& getCarrierPosition(void);
 
-            /* not in protected ?? */
+            /* Should not be here */
             inline void setSpeedAdd(float speedAdd)
                 { this->speedAdd_=speedAdd; }

code/branches/ppspickups1/src/orxonox/items/MultiStateEngine.cc

@@ -129 +129 @@
                 else
                     this->state_ = Idle;
+
+                if (this->state_ = Idle && this->getSpeedAdd()>0)
+                    this->state_ = Normal;
             }