Changeset 3223 for code/branches/core4/src/orxonox/objects/pickup
- Timestamp:
- Jun 23, 2009, 7:28:48 PM (16 years ago)
- Location:
- code/branches/core4/src/orxonox/objects/pickup
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core4/src/orxonox/objects/pickup/PickupCollection.cc
r3196 r3223 66 66 Identifier* ident = Class(UsableItem); 67 67 if(this->currentUsable_ == NULL && item->isA(ident)) 68 this->currentUsable_ = dynamic_cast<UsableItem*>(item);68 this->currentUsable_ = orxonox_cast<UsableItem>(item); 69 69 70 70 this->items_.insert( std::pair<std::string, BaseItem*> (item->getPickupIdentifier(), item) ); … … 336 336 { 337 337 if ((*it).second->isA(ident)) 338 ret.push_back( dynamic_cast<EquipmentItem*>((*it).second));338 ret.push_back(orxonox_cast<EquipmentItem>((*it).second)); 339 339 } 340 340 … … 353 353 { 354 354 if ((*it).second->isA(ident)) 355 ret.push_back( dynamic_cast<PassiveItem*>((*it).second));355 ret.push_back(orxonox_cast<PassiveItem>((*it).second)); 356 356 } 357 357 … … 370 370 { 371 371 if ((*it).second->isA(ident)) 372 ret.push_back( dynamic_cast<UsableItem*>((*it).second));372 ret.push_back(orxonox_cast<UsableItem>((*it).second)); 373 373 } 374 374 -
code/branches/core4/src/orxonox/objects/pickup/PickupSpawner.cc
r3196 r3223 86 86 // = less delays while running 87 87 BaseObject* newObject = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this); 88 BaseItem* asItem = dynamic_cast<BaseItem*>(newObject);88 BaseItem* asItem = orxonox_cast<BaseItem>(newObject); 89 89 if (asItem) 90 90 { … … 154 154 { 155 155 BaseObject* newObject = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this); 156 BaseItem* asItem = dynamic_cast<BaseItem*>(newObject);156 BaseItem* asItem = orxonox_cast<BaseItem>(newObject); 157 157 if (asItem) 158 158 {
Note: See TracChangeset
for help on using the changeset viewer.