Changeset 3325 for code/trunk/src/orxonox/objects/pickup

Timestamp:

Jul 19, 2009, 3:48:00 PM (15 years ago)

Author:

rgrieder

Message:

Merged orxonox_cast related revisions from core4 back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/PickupCollection.cc (modified) (4 diffs)
• src/orxonox/objects/pickup/PickupSpawner.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/pickup/PickupCollection.cc

@@ -66 +66 @@
             Identifier* ident = Class(UsableItem);
             if(this->currentUsable_ == NULL && item->isA(ident))
-                this->currentUsable_ = dynamic_cast<UsableItem*>(item);
+                this->currentUsable_ = orxonox_cast<UsableItem*>(item);
 
             this->items_.insert( std::pair<std::string, BaseItem*> (item->getPickupIdentifier(), item) );
@@ -336 +336 @@
         {
             if ((*it).second->isA(ident))
-                ret.push_back(dynamic_cast<EquipmentItem*>((*it).second));
+                ret.push_back(orxonox_cast<EquipmentItem*>((*it).second));
         }
 
@@ -353 +353 @@
         {
             if ((*it).second->isA(ident))
-                ret.push_back(dynamic_cast<PassiveItem*>((*it).second));
+                ret.push_back(orxonox_cast<PassiveItem*>((*it).second));
         }
 
@@ -370 +370 @@
         {
             if ((*it).second->isA(ident))
-                ret.push_back(dynamic_cast<UsableItem*>((*it).second));
+                ret.push_back(orxonox_cast<UsableItem*>((*it).second));
         }
 

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

@@ -86 +86 @@
         //  = less delays while running
         BaseObject* newObject = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this);
-        BaseItem* asItem = dynamic_cast<BaseItem*>(newObject);
+        BaseItem* asItem = orxonox_cast<BaseItem*>(newObject);
         if (asItem)
         {
@@ -154 +154 @@
         {
             BaseObject* newObject = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this);
-            BaseItem* asItem = dynamic_cast<BaseItem*>(newObject);
+            BaseItem* asItem = orxonox_cast<BaseItem*>(newObject);
             if (asItem)
             {