Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 3, 2014, 1:50:22 PM (12 years ago)
Author:
landauf
Message:

replaced tabs with spaces. no changes in code

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r9939 r9945  
    8686    {
    8787
    88         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
    89         PlayerInfo* player = NULL;
    90 
    91         // Check whether it is a player trigger and extract pawn from it
    92         if(pTrigger != NULL)
    93         {
    94               if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
    95               orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
    96               return false;
    97               }
    98               player = pTrigger->getTriggeringPlayer();
    99         }
    100         else
    101         {
    102               orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
    103               return false;
    104         }
    105         if(player == NULL)
    106         {
    107               orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
    108               return false;
    109         }
    110 
    111             if(bTriggered)
    112         {
    113               // Add player to this Docks candidates
    114               candidates_.insert(player);
    115 
    116               // Show docking dialog
    117               this->showUndockingDialogHelper(player);
    118         }
    119         else
    120         {
    121               // Remove player from candidates list
    122               candidates_.erase(player);
    123         }
    124 
    125         return true;
     88        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
     89        PlayerInfo* player = NULL;
     90
     91        // Check whether it is a player trigger and extract pawn from it
     92        if(pTrigger != NULL)
     93        {
     94            if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
     95            orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
     96            return false;
     97            }
     98            player = pTrigger->getTriggeringPlayer();
     99        }
     100        else
     101        {
     102            orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
     103            return false;
     104        }
     105        if(player == NULL)
     106        {
     107            orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
     108            return false;
     109        }
     110
     111        if(bTriggered)
     112        {
     113            // Add player to this Docks candidates
     114            candidates_.insert(player);
     115
     116            // Show docking dialog
     117            this->showUndockingDialogHelper(player);
     118        }
     119        else
     120        {
     121            // Remove player from candidates list
     122            candidates_.erase(player);
     123        }
     124
     125        return true;
    126126    }
    127127
Note: See TracChangeset for help on using the changeset viewer.