Merge pull request #2 from Radulfr4/TakeMeTo

Take me to fix.
AllegianceZone · Nov 8, 2017 · 2a31d40 · 2a31d40
2 parents 93529b5 + c69f6e2
commit 2a31d40
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 17 deletions.
diff --git a/src/WinTrek/teampane.cpp b/src/WinTrek/teampane.cpp
@@ -1241,19 +1241,35 @@ public TrekClientEventSink
             //
             // assert (pplayer->SideID() != SIDE_TEAMLOBBY);
             {
-                if (Training::IsTraining ())
+                if (Training::IsTraining())
                 {
-                    ImissionIGC*    pCore = trekClient.GetCore ();
-                    IshipIGC*       pShip = pCore->GetShip (shipID);
-                    IclusterIGC*    pCluster = pShip->GetCluster ();
-                    if (!pCluster)
+                    if (Training::CommandViewEnabled())
                     {
-                        IstationIGC*    pStation = pShip->GetStation ();
-                        assert (pStation);
-                        pCluster = pStation->GetCluster ();
-                        assert (pCluster);
+                        ImissionIGC*    pCore = trekClient.GetCore();
+                        IshipIGC*       pShip = pCore->GetShip(shipID); //pplayer->GetShip() should be the same
+                        IclusterIGC*    pCluster = pShip->GetCluster();
+                        const Vector*   ppos;
+                        if (!pCluster)
+                        {
+                            IstationIGC*    pStation = pShip->GetStation();
+                            assert(pStation);
+                            pCluster = pStation->GetCluster();
+                            assert(pCluster);
+                            debugf("Ship is in station in %s.\n", pCluster->GetName());
+                            ppos = pStation && pStation->SeenBySide(trekClient.GetSide()) ? &(pStation->GetPosition()) : NULL;
+                        }
+                        else
+                            ppos = pShip && pShip->SeenBySide(trekClient.GetSide()) ? &(pShip->GetPosition()) : NULL;
+
+                        IclusterIGC*    pClusterShip = trekClient.GetShip()->GetCluster();
+                        if ((pClusterShip == NULL) || (pClusterShip == pCluster)) { //check if in station or in the same sector
+                            if (GetWindow()->GetViewMode() != TrekWindow::vmCommand)
+                                GetWindow()->SetViewMode(TrekWindow::vmCommand);
+
+                    	    //trekClient.RequestViewCluster (pCluster, pplayer->GetShip()); //fails for ships in stations
+                            trekClient.SetViewCluster(pCluster, ppos); 
+                        }
                     }
-                    trekClient.RequestViewCluster (pCluster, pplayer->GetShip());
                 }
                 else if (pplayer->GetShipStatus().GetSectorID() != NA)
                 {
@@ -1279,7 +1295,7 @@ public TrekClientEventSink
                     }
                 }
 
-                GetWindow()->GetConsoleImage()->GetConsoleData()->PickShip(pplayer->GetShip());
+                GetWindow()->GetConsoleImage()->GetConsoleData()->PickShip(pplayer->GetShip()); //Select the ship
             }
         }
 

diff --git a/src/WinTrek/trekigc.cpp b/src/WinTrek/trekigc.cpp
@@ -4235,7 +4235,7 @@ void      WinTrekClient::ReceiveChat(IshipIGC*   pshipSender,
     if (Training::IsTraining ())
     {
         // prevent players from giving commands to themselves
-        if (pshipSender && (oidRecipient == pshipSender->GetObjectID ()) && (Training::GetTrainingMissionID() != Training::c_TM_10_Free_Flight))
+        if (pshipSender && (oidRecipient == pshipSender->GetObjectID ()) && !Training::CommandViewEnabled())
             pmodelTarget = NULL;
 
         // send out the chat we are getting to see if we are waiting for it...

diff --git a/src/training/Training.cpp b/src/training/Training.cpp
@@ -149,6 +149,11 @@ namespace Training
     */
     }
 
+    //------------------------------------------------------------------------------
+    bool            CommandViewEnabled(void) {
+        return g_pMission ? g_pMission->GetCommandViewEnabled() : false;
+    }
+
     //------------------------------------------------------------------------------
     int             GetTrainingMissionID (void)
     {

diff --git a/src/training/Training.h b/src/training/Training.h
@@ -40,6 +40,7 @@ namespace Training
     void            SetSkipPostSlideshow (void);
     bool            IsTraining (void);
     bool            IsInstalled (void);
+    bool            CommandViewEnabled(void);
     int             GetTrainingMissionID (void);
     SectorID        GetStartSectorID (void);
     void            SetupShipAndCamera (void);

diff --git a/src/training/mission10.cpp b/src/training/mission10.cpp
@@ -53,9 +53,7 @@ namespace Training
     void        Mission10::CreateUniverse(void)
     {
         LoadUniverse("training_3", 488, 1030);    // a fighter 3
-
-                                                  // activate all the starting weapons
-        trekClient.fGroupFire = true;
+        trekClient.fGroupFire = true;             // activate all the starting weapons
 
         // put the commander ship in the station
         ImissionIGC*    pCore = trekClient.GetCore();
@@ -70,7 +68,9 @@ namespace Training
     //------------------------------------------------------------------------------
     Condition*  Mission10::CreateMission(void)
     {
-        debugf("Creating mission.");
+        debugf("Creating mission 10.\n");
+        m_commandViewEnabled = true;
+
         GoalList*   pGoalList = new GoalList;
 
         // wait .1 seconds, so stuff is initialized

diff --git a/src/training/trainingmission.cpp b/src/training/trainingmission.cpp
@@ -64,7 +64,8 @@ namespace Training
     m_pDeadCondition (0),
     m_commanderID (NA),
     m_pChatCondition (0),
-    m_bSkipPostSlideShow (false)
+    m_bSkipPostSlideShow (false),
+    m_commandViewEnabled(false)
     {
         // get the window pointer
         TrekWindow* pWindow = GetWindow ();
@@ -490,6 +491,12 @@ namespace Training
         m_bSkipPostSlideShow = true;
     }
 
+    //------------------------------------------------------------------------------
+    bool        TrainingMission::GetCommandViewEnabled(void)
+    {
+        return m_commandViewEnabled;
+    }
+
     //------------------------------------------------------------------------------
     void        TrainingMission::LoadUniverse (const ZString& name, HullID hullID, StationID homeStationID)
     {

diff --git a/src/training/trainingmission.h b/src/training/trainingmission.h
@@ -46,6 +46,7 @@ namespace Training
                     void                    AddPartToShip (PartID part, Mount mount, short ammo = 0);
                     IshipIGC*               CreateDrone (const ZString& name, ShipID shipID, HullID hullID, SideID sideID, PilotType pilotType);
                     void                    SetSkipPostSlideshow (void);
+                    bool                    GetCommandViewEnabled(void);
 
         protected:
             virtual void                    CreateUniverse (void) = 0;
@@ -71,6 +72,7 @@ namespace Training
                     TrekWindow::ViewMode    m_deadViewMode;
                     TrekWindow::CameraMode  m_deadCameraMode;
                     bool                    m_bSkipPostSlideShow;
+                    bool                    m_commandViewEnabled;
     };
 
     //------------------------------------------------------------------------------