Changeset 6755 for code/trunk

Timestamp:

Apr 19, 2010, 4:12:23 PM (15 years ago)

Author:

dafrick

Message:

Fixed Segfault upon dropping of InvisiblePickup, while it was being used.

Location:

code/trunk/src/modules/pickup/items

Files:

• InvisiblePickup.cc (modified) (2 diffs)
• SpeedPickup.cc (modified) (1 diff)

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

@@ -113 +113 @@
         if (this->isUsed())
         {
-            this->startPickupTimer(this->getDuration());
+            if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() > 0.0f)
+            {
+                this->getTimer()->unpauseTimer();
+            }
+            else
+            {
+                this->startPickupTimer(this->getDuration());
+            }
             this->setInvisible(true);
         }
@@ -119 +126 @@
         {
             this->setInvisible(false);
-            this->destroy();
+        
+            if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())
+            {
+                this->destroy();
+            }
+            else
+            {
+                this->getTimer()->pauseTimer();
+            }
         }
         

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

@@ -161 +161 @@
                 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();
                 }