Changeset 3325 for code/trunk/src/orxonox/objects/controllers/HumanController.cc

Timestamp:

Jul 19, 2009, 3:48:00 PM (16 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/controllers/HumanController.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/controllers/HumanController.cc

@@ -161 +161 @@
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {
-            Pawn* pawn = dynamic_cast<Pawn*>(HumanController::localController_s->controllableEntity_);
+            Pawn* pawn = orxonox_cast<Pawn*>(HumanController::localController_s->controllableEntity_);
             if (pawn)
                 pawn->kill();
@@ -196 +196 @@
     {
         if (HumanController::localController_s)
-            return dynamic_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
+            return orxonox_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
         else
             return NULL;