Changeset 6728 for code/trunk/src/modules/pickup/items

Timestamp:

Apr 15, 2010, 1:15:11 PM (15 years ago)

Author:

dafrick

Message:

No more seg faults with pickups (at least that's what I hope. )

File:

• code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) (2 diffs)

code/trunk/src/modules/pickup/items/SpeedPickup.cc

@@ -141 +141 @@
         if(this->isUsed())
         {
-            this->startPickupTimer(this->getDuration());
+            if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() > 0.0f)
+            {
+                this->getTimer()->unpauseTimer();
+            }
+            else
+            {
+                this->startPickupTimer(this->getDuration());
+            }
             engine->setSpeedAdd(this->getSpeedAdd());
             engine->setSpeedMultiply(this->getSpeedMultiply());
@@ -152 +159 @@
             if(this->isOnce())
             {
-                this->destroy();
+                if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())
+                {
+                    //TODO: Potentially dangerous, not only for this pickup. Think long and hard about this!!!
+                    this->destroy();
+                }
+                else
+                {
+                    this->getTimer()->pauseTimer();
+                }
             }
         }