Merged linux changes, fixed first item in inventory not being loaded, fixed levels breaking if re-entering the same level

2015-11-19 16:29:13 +02:00
parent 118d60342a
commit f42cc78af3
23 changed files with 42 additions and 65 deletions
@@ -143,11 +143,13 @@ namespace Barotrauma
            if (Level.Loaded.AtEndPosition)
            {
                endShiftButton.Text = "Enter " + Map.SelectedLocation.Name;
+                endShiftButton.Font = GUI.SmallFont;
                endShiftButton.Draw(spriteBatch);
            }
            else if (Level.Loaded.AtStartPosition)
            {
                endShiftButton.Text = "Enter " + Map.CurrentLocation.Name;
+                endShiftButton.Font = GUI.SmallFont;
                endShiftButton.Draw(spriteBatch);
            }