(53c2ee2d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:47:06 +03:00
parent 9f99113dd4
commit 4b7458cc44
11 changed files with 336 additions and 186 deletions
@@ -1158,6 +1158,19 @@ namespace Barotrauma
                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
            }
            
+            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
+            {
+                SmoothedCursorPosition = cursorPosition;
+            }
+            else
+            {
+                //apply some smoothing to the cursor positions of remote players when playing as a client
+                //to make aiming look a little less choppy
+                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
+                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
+                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
+            }
+            
            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
            {
                if (speedMultipliers.Count == 0) return 1f;