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

2019-04-29 21:12:15 +03:00
parent 0b1b39d70a
commit 2c1a5be93e
2 changed files with 4 additions and 83 deletions
@@ -1149,6 +1149,10 @@ namespace Barotrauma
            {
                body.SetTransform(body.SimPosition - Submarine.SimPosition, body.Rotation);
            }
+            else if (Submarine != null && prevSub != null && Submarine != prevSub)
+            {
+                body.SetTransform(body.SimPosition + prevSub.SimPosition - Submarine.SimPosition, body.Rotation);
+            }

            Vector2 displayPos = ConvertUnits.ToDisplayUnits(body.SimPosition);
            rect.X = (int)(displayPos.X - rect.Width / 2.0f);