vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(6844335fb) Fixed incorrect text tag in submarine save dialog

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-16 17:10:25 +03:00
parent 9e3d13b1c9
commit dd371c29cc
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs
+1 -10
View File
@@ -440,16 +440,6 @@ namespace Barotrauma
} }
} }
public override void Update(float deltaTime, Camera cam, bool isSubInventory = false)
{
if (!AccessibleWhenAlive && !character.IsDead)
{
syncItemsDelay = Math.Max(syncItemsDelay - deltaTime, 0.0f);
return;
}
base.Update(deltaTime, cam);
//force personal slots open if an item is running out of battery/fuel/oxygen/etc //force personal slots open if an item is running out of battery/fuel/oxygen/etc
if (hidePersonalSlots) if (hidePersonalSlots)
{ {
@@ -473,6 +463,7 @@ namespace Barotrauma
{ {
UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex, cam); UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex, cam);
} }
}
Rectangle hoverArea = GetSubInventoryHoverArea(highlightedSubInventorySlot); Rectangle hoverArea = GetSubInventoryHoverArea(highlightedSubInventorySlot);
if (highlightedSubInventorySlot.Inventory?.slots == null || (!hoverArea.Contains(PlayerInput.MousePosition))) if (highlightedSubInventorySlot.Inventory?.slots == null || (!hoverArea.Contains(PlayerInput.MousePosition)))
Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs
+1 -1
View File
@@ -1017,7 +1017,7 @@ namespace Barotrauma
var previewImageButtonHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.1f), rightColumn.RectTransform), isHorizontal: true) { Stretch = true, RelativeSpacing = 0.05f }; var previewImageButtonHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.1f), rightColumn.RectTransform), isHorizontal: true) { Stretch = true, RelativeSpacing = 0.05f };
new GUIButton(new RectTransform(new Vector2(0.5f, 1.0f), previewImageButtonHolder.RectTransform), TextManager.Get("SubPreviewImageGenerate")) new GUIButton(new RectTransform(new Vector2(0.5f, 1.0f), previewImageButtonHolder.RectTransform), TextManager.Get("SubPreviewImageCreate"))
{ {
OnClicked = (btn, userdata) => OnClicked = (btn, userdata) =>
{ {