Fixed issue RemoteTechnologiesGroup#92, RemoteTechnologiesGroup#91.

Sander Hoksbergen · Sander Hoksbergen · commit 58cc056cad63 · 2013-10-28T19:56:15.000+01:00
diff --git a/src/RemoteTech2/FlightComputer/FlightComputer.cs b/src/RemoteTech2/FlightComputer/FlightComputer.cs
@@ -102,6 +102,7 @@ private void Enqueue(FlightCtrlState fs)
         private void PopFlightCtrlState(FlightCtrlState fcs)
         {
             FlightCtrlState delayed = mPreviousFcs;
+            mPreviousFcs.Neutralize();
             while (mFlightCtrlBuffer.Count > 0 && mFlightCtrlBuffer.Peek().TimeStamp < RTUtil.GameTime)
             {
                 delayed = mFlightCtrlBuffer.Dequeue().State;
@@ -167,12 +168,16 @@ private void OnFlyByWirePre(FlightCtrlState fcs)
             var satellite = RTCore.Instance.Satellites[mParent.Guid];
             if (satellite == null || satellite.SignalProcessor != mParent) return;
 
-            if (mVessel == FlightGlobals.ActiveVessel && InputAllowed)
+            if (mVessel == FlightGlobals.ActiveVessel && InputAllowed && !satellite.HasLocalControl)
             {
                 Enqueue(fcs);
             }
 
-            PopFlightCtrlState(fcs);
+            if (!satellite.HasLocalControl)
+            {
+                PopFlightCtrlState(fcs);
+            }
+            
         }
 
         private void OnFlyByWirePost(FlightCtrlState fcs)
@@ -184,6 +189,8 @@ private void OnFlyByWirePost(FlightCtrlState fcs)
             {
                 fcs.Neutralize();
             }
+
+            mPreviousFcs.CopyFrom(fcs);
         }
 
         IEnumerator IEnumerable.GetEnumerator()
diff --git a/src/RemoteTech2/Modules/ModuleRTAntenna.cs b/src/RemoteTech2/Modules/ModuleRTAntenna.cs
@@ -130,10 +130,10 @@ public virtual void SetState(bool state)
         {
             bool prev_state = IsRTActive;
             IsRTActive = state && !IsRTBroken;
-            Events["EventOpen"].guiActive = !IsRTActive && !IsRTBroken;
-            Events["EventOpen"].active = Events["EventOpen"].guiActive;
-            Events["EventClose"].guiActive = IsRTActive && !IsRTBroken;
-            Events["EventClose"].active = Events["EventClose"].guiActive;
+            Events["EventOpen"].guiActive = Events["OverrideOpen"].guiActiveUnfocused = !IsRTActive && !IsRTBroken;
+            Events["EventOpen"].active = Events["OverrideOpen"].guiActiveUnfocused = Events["EventOpen"].guiActive;
+            Events["EventClose"].guiActive = Events["OverrideClose"].guiActiveUnfocused = IsRTActive && !IsRTBroken;
+            Events["EventClose"].active = Events["OverrideClose"].guiActiveUnfocused = Events["EventClose"].guiActive;
             UpdateContext();
             if(IsRTActive != prev_state) StartCoroutine(SetFXModules_Coroutine(mDeployFxModules, IsRTActive ? 1.0f : 0.0f));
             var satellite = RTCore.Instance.Network[Guid];
@@ -201,13 +201,27 @@ public void ActionClose(KSPActionParam param)
             EventClose();
         }
 
-        [KSPEvent(name = "OverrideTarget", active = true, guiActiveUnfocused = true, unfocusedRange = 10, externalToEVAOnly = true, guiName = "[EVA] Set Target")]
+        [KSPEvent(name = "OverrideTarget", active = true, guiActiveUnfocused = true, unfocusedRange = 5, externalToEVAOnly = true, guiName = "[EVA] Set Target")]
         [IgnoreSignalDelayAttribute]
         public void OverrideTarget()
         {
             (new AntennaWindow(this)).Show();
         }
 
+        [KSPEvent(name = "OverrideOpen", active = true, guiActiveUnfocused = true, unfocusedRange = 5, externalToEVAOnly = true, guiName = "[EVA] Force Open")]
+        [IgnoreSignalDelayAttribute]
+        public void OverrideOpen()
+        {
+            EventOpen();
+        }
+
+        [KSPEvent(name = "OverrideClose", active = true, guiActiveUnfocused = true, unfocusedRange = 5, externalToEVAOnly = true, guiName = "[EVA] Force Close")]
+        [IgnoreSignalDelayAttribute]
+        public void OverrideClose()
+        {
+            EventClose();
+        }
+
         public void OnConnectionRefresh()
         {
             SetState(IsRTActive);
diff --git a/src/RemoteTech2/RTCore.cs b/src/RemoteTech2/RTCore.cs
@@ -68,19 +68,7 @@ public void Update()
                 }
                 else if (vs.HasLocalControl)
                 {
-                    foreach (KSPActionGroup ag in GetActivatedGroup())
-                    {
-                        FlightGlobals.ActiveVessel.ActionGroups.ToggleGroup(ag);
-                        if (ag == KSPActionGroup.Stage && !FlightInputHandler.fetch.stageLock)
-                        {
-                            Staging.ActivateNextStage();
-                            ResourceDisplay.Instance.Refresh();
-                        }
-                        if (ag == KSPActionGroup.RCS)
-                        {
-                            FlightInputHandler.fetch.rcslock = !FlightInputHandler.RCSLock;
-                        }
-                    }
+                    ReleaseLocks();
                 }
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ private void Enqueue(FlightCtrlState fs)`
`102`	`102`	`private void PopFlightCtrlState(FlightCtrlState fcs)`
`103`	`103`	`{`
`104`	`104`	`FlightCtrlState delayed = mPreviousFcs;`
	`105`	`+ mPreviousFcs.Neutralize();`
`105`	`106`	`while (mFlightCtrlBuffer.Count > 0 && mFlightCtrlBuffer.Peek().TimeStamp < RTUtil.GameTime)`
`106`	`107`	`{`
`107`	`108`	`delayed = mFlightCtrlBuffer.Dequeue().State;`
`@@ -167,12 +168,16 @@ private void OnFlyByWirePre(FlightCtrlState fcs)`
`167`	`168`	`var satellite = RTCore.Instance.Satellites[mParent.Guid];`
`168`	`169`	`if (satellite == null \|\| satellite.SignalProcessor != mParent) return;`
`169`	`170`
`170`		`- if (mVessel == FlightGlobals.ActiveVessel && InputAllowed)`
	`171`	`+ if (mVessel == FlightGlobals.ActiveVessel && InputAllowed && !satellite.HasLocalControl)`
`171`	`172`	`{`
`172`	`173`	`Enqueue(fcs);`
`173`	`174`	`}`
`174`	`175`
`175`		`- PopFlightCtrlState(fcs);`
	`176`	`+ if (!satellite.HasLocalControl)`
	`177`	`+ {`
	`178`	`+ PopFlightCtrlState(fcs);`
	`179`	`+ }`
	`180`	`+`
`176`	`181`	`}`
`177`	`182`
`178`	`183`	`private void OnFlyByWirePost(FlightCtrlState fcs)`
`@@ -184,6 +189,8 @@ private void OnFlyByWirePost(FlightCtrlState fcs)`
`184`	`189`	`{`
`185`	`190`	`fcs.Neutralize();`
`186`	`191`	`}`
	`192`	`+`
	`193`	`+ mPreviousFcs.CopyFrom(fcs);`
`187`	`194`	`}`
`188`	`195`
`189`	`196`	`IEnumerator IEnumerable.GetEnumerator()`
Original file line number	Diff line number	Diff line change
`@@ -68,19 +68,7 @@ public void Update()`
`68`	`68`	`}`
`69`	`69`	`else if (vs.HasLocalControl)`
`70`	`70`	`{`
`71`		`- foreach (KSPActionGroup ag in GetActivatedGroup())`
`72`		`- {`
`73`		`- FlightGlobals.ActiveVessel.ActionGroups.ToggleGroup(ag);`
`74`		`- if (ag == KSPActionGroup.Stage && !FlightInputHandler.fetch.stageLock)`
`75`		`- {`
`76`		`- Staging.ActivateNextStage();`
`77`		`- ResourceDisplay.Instance.Refresh();`
`78`		`- }`
`79`		`- if (ag == KSPActionGroup.RCS)`
`80`		`- {`
`81`		`- FlightInputHandler.fetch.rcslock = !FlightInputHandler.RCSLock;`
`82`		`- }`
`83`		`- }`
	`71`	`+ ReleaseLocks();`
`84`	`72`	`}`
`85`	`73`	`}`
`86`	`74`	`else`