Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 9, 2013, 3:57:28 PM (11 years ago)
Author:
agermann
Message:

The level EntryTest.oxw can be deleted. Finally a nice and working solution.

Location:
code/branches/spacestationentry/src/modules/docking
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/spacestationentry/src/modules/docking/Dock.cc

    r9857 r9885  
    8585    bool Dock::undocking(bool bTriggered, BaseObject* trigger)
    8686    {
    87         // Noch lange nicht fertig (leich veraenderte Kopie von execute())
     87
    8888        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                     cmdUndock();
    114                 }
    115                 else
    116                 {
    117                     // Remove player from candidates list
    118                     candidates_.erase(player);
    119                 }
    120 
    121                 return true;
     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;
    122126    }
    123127
     
    166170    }
    167171
     172
     173    void Dock::showUndockingDialogHelper(PlayerInfo* player)
     174        {
     175            assert(player);
     176
     177            if(!player->isHumanPlayer())
     178                return;
     179
     180            if(GameMode::isMaster())
     181            {
     182                if(GameMode::showsGraphics())
     183                    GUIManager::showGUI("UndockingDialog");
     184            }
     185            else
     186                callStaticNetworkFunction(Dock::showDockingDialog, player->getClientID());
     187
     188        }
    168189
    169190    void Dock::showDockingDialogHelper(PlayerInfo* player)
  • code/branches/spacestationentry/src/modules/docking/Dock.h

    r9857 r9885  
    8686            void dock()
    8787                { this->dock(HumanController::getLocalControllerSingleton()->getPlayer()); }
     88            void undock()
     89                { this->undock(HumanController::getLocalControllerSingleton()->getPlayer()); }
    8890            static unsigned int getNumberOfActiveDocks();
    8991            static Dock* getActiveDockAtIndex(unsigned int index);
     
    9698            // Network functions
    9799            void showDockingDialogHelper(PlayerInfo* player);
     100            void showUndockingDialogHelper(PlayerInfo* player);
    98101            static void showDockingDialog();
    99102
  • code/branches/spacestationentry/src/modules/docking/MoveToDockingTarget.cc

    r9667 r9885  
    6666    {
    6767        //TODO: Investigate strange things...
    68         this->parent_->detach((WorldEntity*)player->getControllableEntity());
     68        //this->parent_->detach((WorldEntity*)player->getControllableEntity());
    6969
     70        //TODO: Check the issue with this detach call.
     71        //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.
     72        //Didn't find the need for the line.
    7073        this->parent_->undockingAnimationFinished(player);
    7174        return true;
Note: See TracChangeset for help on using the changeset viewer.