(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
@@ -423,7 +423,14 @@ namespace Barotrauma
                    columns++;
                }

-                int startX = slot.Rect.Center.X - (int)(subRect.Width * (columns / 2.0f) + spacing.X * ((columns - 1) / 2.0f));
+                int width = (int)(subRect.Width * columns + spacing.X * (columns - 1));
+                int startX = slot.Rect.Center.X - (int)(width / 2.0f);
+
+                //prevent the inventory from extending outside the left side of the screen
+                startX = Math.Max(startX, 10);
+                //same for the right side of the screen
+                startX -= Math.Max((startX + width) - GameMain.GraphicsWidth, 0);
+
                subRect.X = startX;
                int startY = dir < 0 ?
                    slot.EquipButtonRect.Y - subRect.Height - (int)(35 * UIScale) :