Changeset 3239 for code/branches/core4/src/orxonox/objects/controllers

Timestamp:

Jun 28, 2009, 2:45:37 PM (16 years ago)

Author:

rgrieder

Message:

Found a way to write orxonox_cast<T*> instead of orxonox_cast<T> so that the syntax resembles dynamic_cast<T*>.

Location:

code/branches/core4/src/orxonox/objects/controllers

Files:

• ArtificialController.cc (modified) (4 diffs)
• HumanController.cc (modified) (2 diffs)

code/branches/core4/src/orxonox/objects/controllers/ArtificialController.cc

@@ -181 +181 @@
         if (entity1->getXMLController())
         {
-            WaypointPatrolController* wpc = orxonox_cast<WaypointPatrolController>(entity1->getXMLController());
+            WaypointPatrolController* wpc = orxonox_cast<WaypointPatrolController*>(entity1->getXMLController());
             if (wpc)
                 team1 = wpc->getTeam();
@@ -187 +187 @@
         if (entity2->getXMLController())
         {
-            WaypointPatrolController* wpc = orxonox_cast<WaypointPatrolController>(entity2->getXMLController());
+            WaypointPatrolController* wpc = orxonox_cast<WaypointPatrolController*>(entity2->getXMLController());
             if (wpc)
                 team2 = wpc->getTeam();
         }
 
-        TeamDeathmatch* tdm = orxonox_cast<TeamDeathmatch>(gametype);
+        TeamDeathmatch* tdm = orxonox_cast<TeamDeathmatch*>(gametype);
         if (tdm)
         {
@@ -203 +203 @@
 
         TeamBaseMatchBase* base = 0;
-        base = orxonox_cast<TeamBaseMatchBase>(entity1);
+        base = orxonox_cast<TeamBaseMatchBase*>(entity1);
         if (base)
         {
@@ -219 +219 @@
             }
         }
-        base = orxonox_cast<TeamBaseMatchBase>(entity2);
+        base = orxonox_cast<TeamBaseMatchBase*>(entity2);
         if (base)
         {

code/branches/core4/src/orxonox/objects/controllers/HumanController.cc

@@ -161 +161 @@
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {
-            Pawn* pawn = orxonox_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 orxonox_cast<Pawn>(HumanController::localController_s->getControllableEntity());
+            return orxonox_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
         else
             return NULL;