Changeset 5929 for code/trunk/src/orxonox/pickup

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/pickup/DroppedItem.cc (modified) (4 diffs)
• src/orxonox/pickup/DroppedItem.h (modified) (1 diff)
• src/orxonox/pickup/ModifierPickup.cc (modified) (2 diffs)
• src/orxonox/pickup/ModifierPickup.h (modified) (2 diffs)
• src/orxonox/pickup/PickupSpawner.cc (modified) (4 diffs)
• src/orxonox/pickup/PickupSpawner.h (modified) (1 diff)
• src/orxonox/pickup/items/HealthImmediate.cc (modified) (1 diff)
• src/orxonox/pickup/items/HealthUsable.cc (modified) (1 diff)
• src/orxonox/pickup/items/Jump.cc (modified) (1 diff)

code/trunk/src/orxonox/pickup/DroppedItem.cc

@@ -56 +56 @@
         if (this->item_)
         {
-            for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); it++)
+            for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
             {
                 Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
@@ -69 +69 @@
         {
             COUT(3) << "DroppedItem '" << this->item_->getPickupIdentifier() << "' picked up." << std::endl;
-            delete this;
+            this->destroy();
         }
     }
@@ -76 +76 @@
         if (this->timeToLive_ > 0)
         {
-            ExecutorMember<DroppedItem>* exec = createExecutor(createFunctor(&DroppedItem::timerCallback));
-            this->timer_.setTimer(this->timeToLive_, false, this, exec, false);
+            this->timer_.setTimer(this->timeToLive_, false, createExecutor(createFunctor(&DroppedItem::timerCallback, this)), false);
         }
     }
@@ -85 +84 @@
         {
             COUT(3) << "Delete DroppedItem with '" << this->item_->getPickupIdentifier() << "'" << std::endl;
-            delete this->item_;
+            this->item_->destroy();
         }
 
-        delete this;
+        this->destroy();
     }
 

code/trunk/src/orxonox/pickup/DroppedItem.h

@@ -77 +77 @@
         BaseItem* item_;
 
-        Timer<DroppedItem> timer_;
+        Timer timer_;
     };
 }

code/trunk/src/orxonox/pickup/ModifierPickup.cc

@@ -101 +101 @@
             if (this->duration_ > 0.0f)
             {
-                ExecutorMember<ModifierPickup>* executor = createExecutor(createFunctor(&ModifierPickup::timerCallback));
+                Executor* executor = createExecutor(createFunctor(&ModifierPickup::timerCallback, this));
                 executor->setDefaultValues(pawn);
-                this->timer_.setTimer(this->duration_, false, this, executor);
+                this->timer_.setTimer(this->duration_, false, executor);
             }
 
@@ -139 +139 @@
                 this->timer_.stopTimer();
 
-            delete this;
+            this->destroy();
 
             return true;

code/trunk/src/orxonox/pickup/ModifierPickup.h

@@ -129 +129 @@
 
         void timerCallback(Pawn* pawn);     //!< Method called when the timer runs out.
+        
     private:
         float getAdditiveModifier(ModifierType::Value type) const;               //!< Get the additive modifier for a given ModifierType.
@@ -138 +139 @@
         std::map<ModifierType::Value, float> multiplicativeModifiers_;           //!< Map of multiplicative modifiers, indexed by ModifierType.
 
-        float duration_;                                                        //!< Duration of this pickup's effect (0 for unlimited).
-        Timer<ModifierPickup> timer_;                                           //!< Timer used if the pickup's effect has a time limit.
+        float duration_;                                                         //!< Duration of this pickup's effect (0 for unlimited).
+        Timer timer_;                                                            //!< Timer used if the pickup's effect has a time limit.
     };
 }

code/trunk/src/orxonox/pickup/PickupSpawner.cc

@@ -91 +91 @@
             asItem->addTemplate(this->itemTemplate_);
             PickupInventory::getImageForItem(asItem);
-            delete newObject;
+            newObject->destroy();
         }
 
@@ -127 +127 @@
         if (this->isActive())
         {
-            for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); it++)
+            for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
             {
                 Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
@@ -166 +166 @@
                     if (this->respawnTime_ > 0.0f)
                     {
-                        ExecutorMember<PickupSpawner>* executor = createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback));
-                        this->respawnTimer_.setTimer(this->respawnTime_, false, this, executor);
+                        this->respawnTimer_.setTimer(this->respawnTime_, false, createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback, this)));
 
                         this->setActive(false);
@@ -174 +173 @@
                 }
                 else
-                    delete newObject;
+                    newObject->destroy();
             }
         }

code/trunk/src/orxonox/pickup/PickupSpawner.h

@@ -114 +114 @@
 
         float respawnTime_;                     //!< Time after which this gets re-actived.
-        Timer<PickupSpawner> respawnTimer_;     //!< Timer used for re-activating.
+        Timer respawnTimer_;                    //!< Timer used for re-activating.
     };
 }

code/trunk/src/orxonox/pickup/items/HealthImmediate.cc

@@ -67 +67 @@
         {
             pawn->addHealth(this->recoveredHealth_);
-            delete this;
+            this->destroy();
         }
 

code/trunk/src/orxonox/pickup/items/HealthUsable.cc

@@ -82 +82 @@
 
             this->removeFrom(pawn);
-            delete this;
+            this->destroy();
         }
     }

code/trunk/src/orxonox/pickup/items/Jump.cc

@@ -84 +84 @@
         {
             this->removeFrom(pawn);
-            delete this;
+            this->destroy();
         }
     }