(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -42,7 +42,7 @@ namespace Barotrauma
        public float GetAverageElapsedMillisecs(string identifier)
        {
            if (!avgTicksPerFrame.ContainsKey(identifier)) return 0.0f;
-            return avgTicksPerFrame[identifier] / TimeSpan.TicksPerMillisecond;
+            return avgTicksPerFrame[identifier] / (float)TimeSpan.TicksPerMillisecond;
        }

        public bool Update(double deltaTime)