Changeset 9279 for code/branches/presentation2012merge/src/orxonox

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/orxonox

Files:

• controllers/NewHumanController.cc (modified) (2 diffs)
• gamestates/GSRoot.cc (modified) (1 diff)
• gametypes/Dynamicmatch.cc (modified) (3 diffs)
• gametypes/LastManStanding.cc (modified) (1 diff)
• gametypes/LastTeamStanding.cc (modified) (1 diff)
• interfaces/Pickupable.cc (modified) (1 diff)
• worldentities/ControllableEntity.cc (modified) (1 diff)

code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc

@@ -298 +298 @@
         //Used in HumanController for formationFlight
         HumanController::hit(originator,contactpoint,damage);
-        
+
         if (this->showDamageOverlay_ && !this->controlPaused_ && this->controllableEntity_ && !this->controllableEntity_->isInMouseLook())
         {
@@ -397 +397 @@
                 try
                 {
-                    wePtr = dynamic_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
+                    wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
                 }
                 catch (...)

code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc

@@ -76 +76 @@
         for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it)
         {
-            if (dynamic_cast<Synchronisable*>(*it))
-                orxout(debug_output) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << endl;
+            Synchronisable* synchronisable = orxonox_cast<Synchronisable*>(*it);
+            if (synchronisable)
+                orxout(debug_output) << "object: " << it->getIdentifier()->getName() << " id: " << synchronisable->getObjectID() << endl;
             else
                 orxout(debug_output) << "object: " << it->getIdentifier()->getName() << endl;

code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc

@@ -151 +151 @@
 
                 //Give new pig boost
-                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(victim);
+                SpaceShip* spaceship = orxonox_cast<SpaceShip*>(victim);
                 this->grantPigBoost(spaceship);
             }
@@ -245 +245 @@
                 }
                 //Give new pig boost
-                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(victim);
+                SpaceShip* spaceship = orxonox_cast<SpaceShip*>(victim);
                 this->grantPigBoost(spaceship);
             }
@@ -426 +426 @@
     {
         std::map<PlayerInfo*, int>::const_iterator it_player = this->playerParty_.find(player);
-        Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+        Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
             if (pawn)
             {

code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc

@@ -211 +211 @@
             if(!player->getControllableEntity())
                 return;
-            Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+            Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
             if(!pawn)
                 return;

code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc

@@ -283 +283 @@
             if(!player->getControllableEntity())
                 return;
-            Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+            Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
             if(!pawn)
                 return;

code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc

@@ -338 +338 @@
         this->clone(item);
 
-        Pickupable* pickup = dynamic_cast<Pickupable*>(item);
+        Pickupable* pickup = orxonox_cast<Pickupable*>(item);
 
         orxout(verbose, context::pickups) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << endl;

code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc

@@ -266 +266 @@
                 this->cameraPositionRootNode_->_update(true, false); // update the camera node because otherwise the camera will drag back in position which looks strange
 
-                NewHumanController* controller = dynamic_cast<NewHumanController*>(this->getController());
+                NewHumanController* controller = orxonox_cast<NewHumanController*>(this->getController());
                 if (controller)
                     controller->centerCursor();