Changeset 6728

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. )

Location:

code/trunk

Files:

• data/levels/pickup.oxw (modified) (1 diff)
• src/modules/pickup/Pickup.h (modified) (2 diffs)
• src/modules/pickup/PickupManager.cc (modified) (2 diffs)
• src/modules/pickup/items/SpeedPickup.cc (modified) (2 diffs)

code/trunk/data/levels/pickup.oxw

@@ -120 +120 @@
     </PickupSpawner>
     
+    <PickupSpawner position="0,-50,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+        <pickup>
+            <HealthPickup activationType=immediate durationType=continuous healthRate=10 health=100 />
+        </pickup>
+    </PickupSpawner>
+    
   </Scene>
 </Level>

code/trunk/src/modules/pickup/Pickup.h

@@ -135 +135 @@
             virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
-            bool startPickupTimer(float durationTime);
+            bool startPickupTimer(float durationTime); //!< Starts the pickup duration timer.
+            /**
+            @brief Get your Timer.
+            @return Returns a pointer to the Timer.
+            */
+            inline Timer* getTimer(void)
+                { return &this->durationTimer_; }
 
+            /**
+            @brief The callback method for the Timer.
+                   Can be overloaded to implement desired functionality.
+            */
             virtual void pickupTimerCallback(void) {}
 
@@ -164 +174 @@
             pickupDurationType::Value durationType_; //!< The duration type of the pickup.
 
+            //! Strings for the activation and duration types.
             static const std::string activationTypeImmediate_s;
             static const std::string activationTypeOnUse_s;

code/trunk/src/modules/pickup/PickupManager.cc

@@ -198 +198 @@
     {
         Pickupable* pickup = carrier->getPickup(index);
-        carrier->drop(pickup);
+        if(pickup != NULL)
+            carrier->drop(pickup);
     }
     
@@ -204 +205 @@
     {
         Pickupable* pickup = carrier->getPickup(index);
-        pickup->setUsed(use);
+        if(pickup != NULL)
+            pickup->setUsed(use);
     }
     

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