Merge branch 'master' of https://github.com/Cilph/RemoteTech2.git

Author: Sander Hoksbergen

src/RemoteTech2/RangeModel/RangeModelExtensions.cs

@@ -45,10 +45,12 @@ public static double DistanceTo(this ISatellite a, NetworkLink<ISatellite> b)
 
         public static bool HasLineOfSightWith(this ISatellite a, ISatellite b)
         {
+            var aPos = a.Position;
+            var bPos = b.Position;
             foreach (CelestialBody referenceBody in FlightGlobals.Bodies)
             {
-                Vector3d bodyFromA = referenceBody.position - a.Position;
-                Vector3d bFromA = b.Position - a.Position;
+                Vector3d bodyFromA = referenceBody.position - aPos;
+                Vector3d bFromA = bPos - aPos;
                 if (Vector3d.Dot(bodyFromA, bFromA) <= 0) continue;
                 Vector3d bFromAnorm = bFromA.normalized;
                 if (Vector3d.Dot(bodyFromA, bFromAnorm) >= bFromA.magnitude) continue;

src/RemoteTech2/VesselSatellite.cs

@@ -25,7 +25,15 @@ public bool HasLocalControl
                 if (mLastFrame != Time.frameCount)
                 {
                     mLastFrame = Time.frameCount;
-                    return mLastLocalControl = SignalProcessor.Vessel.parts.Any(p => p.isControlSource && !p.FindModulesImplementing<ISignalProcessor>().Any());
+                    var vessel = SignalProcessor.Vessel;
+                    if (vessel.loaded)
+                    {
+                        return mLastLocalControl = vessel.parts.Any(p => p.isControlSource && (p.protoModuleCrew.Any() || !p.FindModulesImplementing<ISignalProcessor>().Any()));
+                    }
+                    else
+                    {
+                        return mLastLocalControl = vessel.parts.Any(p => p.isControlSource && (p.protoPartSnapshot.protoModuleCrew.Any() || !p.FindModulesImplementing<ISignalProcessor>().Any()));
+                    }
                 }
                 else
                 {