Changeset 9279 for code/branches/presentation2012merge/src/modules/pickup

Timestamp:

Jun 4, 2012, 10:50:28 PM (12 years ago)

Author:

landauf

Message:

use orxonox_cast instead of dynamic_cast wherever possible

Location:

code/branches/presentation2012merge/src/modules/pickup

Files:

• Pickup.cc (modified) (1 diff)
• PickupCollection.cc (modified) (4 diffs)
• PickupSpawner.cc (modified) (2 diffs)
• items/DamageBoostPickup.cc (modified) (2 diffs)
• items/DronePickup.cc (modified) (3 diffs)
• items/HealthPickup.cc (modified) (3 diffs)
• items/InvisiblePickup.cc (modified) (2 diffs)
• items/MetaPickup.cc (modified) (1 diff)
• items/ShieldPickup.cc (modified) (2 diffs)
• items/ShrinkPickup.cc (modified) (4 diffs)
• items/SpeedPickup.cc (modified) (2 diffs)

code/branches/presentation2012merge/src/modules/pickup/Pickup.cc

@@ -210 +210 @@
         SUPER(Pickup, clone, item);
 
-        Pickup* pickup = dynamic_cast<Pickup*>(item);
+        Pickup* pickup = orxonox_cast<Pickup*>(item);
         pickup->setActivationTypeDirect(this->getActivationTypeDirect());
         pickup->setDurationTypeDirect(this->getDurationTypeDirect());

code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc

@@ -79 +79 @@
         }
         this->pickups_.clear();
-        
+
         if(this->pickupCollectionIdentifier_ != NULL)
             delete this->pickupCollectionIdentifier_;
@@ -195 +195 @@
             return;
 
-        // If at least all the enabled pickups of this PickupCollection are no longer picked up. 
+        // If at least all the enabled pickups of this PickupCollection are no longer picked up.
         if(this->pickedUpCounter_ <= this->disabledCounter_ && this->isPickedUp())
             this->Pickupable::destroy();
@@ -218 +218 @@
         SUPER(PickupCollection, clone, item);
 
-        PickupCollection* pickup = dynamic_cast<PickupCollection*>(item);
+        PickupCollection* pickup = orxonox_cast<PickupCollection*>(item);
         // Clone all Pickupables this PickupCollection consist of.
         for(std::vector<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
@@ -297 +297 @@
         This is used internally by the CollectiblePickup class.
     @param changed
-        The value the used status has changed to. 
+        The value the used status has changed to.
     */
     void PickupCollection::pickupChangedUsed(bool changed)

code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc

@@ -199 +199 @@
 
                 Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
-                PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(*it);
+                PickupCarrier* carrier = orxonox_cast<PickupCarrier*>(*it);
                 // If a PickupCarrier, that fits the target-range of the Pickupable spawned by this PickupSpawner, is in trigger-distance and the carrier is not blocked.
                 if(distance.length() < this->triggerDistance_ && carrier != NULL && this->blocked_.find(carrier) == this->blocked_.end())
@@ -303 +303 @@
             orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") triggered and active." << endl;
 
-            PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
+            PickupCarrier* carrier = orxonox_cast<PickupCarrier*>(pawn);
             assert(carrier);
 

code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc

@@ -180 +180 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        SpaceShip* ship = dynamic_cast<SpaceShip*>(carrier);
+        SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
 
         if(ship == NULL)
@@ -203 +203 @@
         SUPER(DamageBoostPickup, clone, item);
 
-        DamageBoostPickup* pickup = dynamic_cast<DamageBoostPickup*>(item);
+        DamageBoostPickup* pickup = orxonox_cast<DamageBoostPickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->setDamageMultiplier(this->getDamageMultiplier());

code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc

@@ -144 +144 @@
 
                 Controller* controller = drone->getController();
-                DroneController* droneController = dynamic_cast<DroneController*>(controller);
+                DroneController* droneController = orxonox_cast<DroneController*>(controller);
                 if(droneController != NULL)
                 {
@@ -175 +175 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         if(pawn == NULL)
@@ -198 +198 @@
         SUPER(DronePickup, clone, item);
 
-        DronePickup* pickup = dynamic_cast<DronePickup*>(item);
+        DronePickup* pickup = orxonox_cast<DronePickup*>(item);
         pickup->setDroneTemplate(this->getDroneTemplate());
 

code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc

@@ -230 +230 @@
             {
                 PickupCarrier* carrier = this->getCarrier();
-                Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+                Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
                 if(pawn == NULL)
@@ -264 +264 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         if(pawn == NULL)
@@ -285 +285 @@
         SUPER(HealthPickup, clone, item);
 
-        HealthPickup* pickup = dynamic_cast<HealthPickup*>(item);
+        HealthPickup* pickup = orxonox_cast<HealthPickup*>(item);
         pickup->setHealth(this->getHealth());
         pickup->setHealthRate(this->getHealthRate());

code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc

@@ -159 +159 @@
         SUPER(InvisiblePickup, clone, item);
 
-        InvisiblePickup* pickup = dynamic_cast<InvisiblePickup*>(item);
+        InvisiblePickup* pickup = orxonox_cast<InvisiblePickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->initializeIdentifier();
@@ -202 +202 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         if(pawn == NULL)

code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc

@@ -172 +172 @@
         SUPER(MetaPickup, clone, item);
 
-        MetaPickup* pickup = dynamic_cast<MetaPickup*>(item);
+        MetaPickup* pickup = orxonox_cast<MetaPickup*>(item);
         pickup->setMetaTypeDirect(this->getMetaTypeDirect());
 

code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc

@@ -177 +177 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         if(pawn == NULL)
@@ -199 +199 @@
         SUPER(ShieldPickup, clone, item);
 
-        ShieldPickup* pickup = dynamic_cast<ShieldPickup*>(item);
+        ShieldPickup* pickup = orxonox_cast<ShieldPickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->setShieldAbsorption(this->getShieldAbsorption());

code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc

@@ -148 +148 @@
     {
         SUPER(ShrinkPickup, changedPickedUp);
-        
+
         if(!this->isPickedUp() && this->isActive_)
         {
@@ -271 +271 @@
 
                 bool destroy = false;
-                
+
                 // Stop shrinking if the desired size is reached.
                 if(this->timeRemainig_ <= 0.0f)
@@ -314 +314 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         return pawn;
@@ -331 +331 @@
 
         SUPER(ShrinkPickup, clone, item);
-        ShrinkPickup* pickup = dynamic_cast<ShrinkPickup*>(item);
+        ShrinkPickup* pickup = orxonox_cast<ShrinkPickup*>(item);
         pickup->setShrinkFactor(this->getShrinkFactor());
         pickup->setDuration(this->getDuration());

code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc

@@ -176 +176 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        SpaceShip* ship = dynamic_cast<SpaceShip*>(carrier);
+        SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
 
         if(ship == NULL)
@@ -199 +199 @@
         SUPER(SpeedPickup, clone, item);
 
-        SpeedPickup* pickup = dynamic_cast<SpeedPickup*>(item);
+        SpeedPickup* pickup = orxonox_cast<SpeedPickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->setSpeedAdd(this->getSpeedAdd());