Changeset 9945 for code/trunk/src/modules/docking

Timestamp:

Jan 3, 2014, 1:50:22 PM (11 years ago)

Author:

landauf

Message:

replaced tabs with spaces. no changes in code

Location:

code/trunk/src/modules/docking

Files:

• Dock.cc (modified) (1 diff)
• MoveToDockingTarget.cc (modified) (1 diff)

code/trunk/src/modules/docking/Dock.cc

@@ -86 +86 @@
     {
 
-        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
-
-        // Check whether it is a player trigger and extract pawn from it
-        if(pTrigger != NULL)
-        {
-              if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
-              orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
-              return false;
-              }
-              player = pTrigger->getTriggeringPlayer();
-        }
-        else
-        {
-              orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
-              return false;
-        }
-        if(player == NULL)
-        {
-              orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
-              return false;
-        }
-
-            if(bTriggered)
-        {
-              // Add player to this Docks candidates
-              candidates_.insert(player);
-
-              // Show docking dialog
-              this->showUndockingDialogHelper(player);
-        }
-        else
-        {
-              // Remove player from candidates list
-              candidates_.erase(player);
-        }
-
-        return true;
+        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
+        PlayerInfo* player = NULL;
+
+        // Check whether it is a player trigger and extract pawn from it
+        if(pTrigger != NULL)
+        {
+            if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
+            orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
+            return false;
+            }
+            player = pTrigger->getTriggeringPlayer();
+        }
+        else
+        {
+            orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
+            return false;
+        }
+        if(player == NULL)
+        {
+            orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
+            return false;
+        }
+
+        if(bTriggered)
+        {
+            // Add player to this Docks candidates
+            candidates_.insert(player);
+
+            // Show docking dialog
+            this->showUndockingDialogHelper(player);
+        }
+        else
+        {
+            // Remove player from candidates list
+            candidates_.erase(player);
+        }
+
+        return true;
     }
 

code/trunk/src/modules/docking/MoveToDockingTarget.cc

@@ -66 +66 @@
     {
         //TODO: Investigate strange things...
-        //this->parent_->detach((WorldEntity*)player->getControllableEntity());
+        //this->parent_->detach((WorldEntity*)player->getControllableEntity());
 
-        //TODO: Check the issue with this detach call.
-        //I have removed the line because the detach call only caused a warning and terminated. And because I didn't find a attach call either.
-        //Didn't find the need for the line.
+        //TODO: Check the issue with this detach call.
+        //I have removed the line because the detach call only caused a warning and terminated. And because I didn't find a attach call either.
+        //Didn't find the need for the line.
         this->parent_->undockingAnimationFinished(player);
         return true;