When server is physics warping, just set rate to 1x and live with the…

… jitteryness. Fixes #1
DanielKinsman · Apr 16, 2014 · 3371602 · 3371602
1 parent 917d616
commit 3371602
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/client/flight.cs b/client/flight.cs
@@ -149,6 +149,14 @@ public static void UpdateTime(comms.Time timeUpdate)
             if(Math.Abs(Planetarium.GetUniversalTime() - timeUpdate.UniversalTime) > maxTimeDelta)
                 Planetarium.SetUniversalTime(timeUpdate.UniversalTime);
 
+            if(timeUpdate.TimeWarpRate > 1.0f && timeUpdate.TimeWarpRate <= 4.0f)
+            {
+                // Server most likely physics warping. We can't do that, so just set it to 1x.
+                if(TimeWarp.CurrentRateIndex != 0)
+                    TimeWarp.SetRate(0, false);
+                return;
+            }
+
             if(TimeWarp.CurrentRateIndex != timeUpdate.TimeWarpRateIndex)
                 TimeWarp.SetRate(timeUpdate.TimeWarpRateIndex, false);
         }

diff --git a/comms/time.cs b/comms/time.cs
@@ -32,14 +32,18 @@ public class Time
         [ProtoMember(2)]
         public int TimeWarpRateIndex {get;set;}
 
+        [ProtoMember(3)]
+        public float TimeWarpRate {get;set;}
+
         public Time()
         {
         }
 
-        public Time(double universalTime, int timeWarpRateIndex)
+        public Time(double universalTime, int timeWarpRateIndex, float timeWarpRate)
         {
             this.UniversalTime = universalTime;
             this.TimeWarpRateIndex = timeWarpRateIndex;
+            this.TimeWarpRate = timeWarpRate;
         }
     }
 }
diff --git a/server/server.cs b/server/server.cs
@@ -144,7 +144,7 @@ public void UnityWorker()
             try
             {
                 var packet = new comms.Packet();
-                packet.Time = new comms.Time(Planetarium.GetUniversalTime(), TimeWarp.CurrentRateIndex);
+                packet.Time = new comms.Time(Planetarium.GetUniversalTime(), TimeWarp.CurrentRateIndex, TimeWarp.CurrentRate);
 
                 if(FlightGlobals.ActiveVessel != null)
                     packet.Vessel = new comms.Vessel(FlightGlobals.ActiveVessel);