Changeset 3325 for code/trunk/src/orxonox/objects/worldentities/triggers

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/worldentities/triggers/CheckPoint.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

@@ -85 +85 @@
         DistanceTrigger::triggered(bIsTriggered);
 
-        Asteroids* gametype = dynamic_cast<Asteroids*>(this->getGametype());
+        Asteroids* gametype = orxonox_cast<Asteroids*>(this->getGametype());
         if (gametype)
         {

code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -120 +120 @@
     for (ClassTreeMaskObjectIterator it = this->targetMask_.begin(); it != this->targetMask_.end(); ++it)
     {
-      WorldEntity* entity = dynamic_cast<WorldEntity*>(*it);
+      WorldEntity* entity = orxonox_cast<WorldEntity*>(*it);
       if (!entity)
         continue;
@@ -131 +131 @@
         if(this->isForPlayer())
         {
-          Pawn* player = dynamic_cast<Pawn*>(entity);
+          Pawn* player = orxonox_cast<Pawn*>(entity);
           this->setTriggeringPlayer(player);
         }