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

Build 0.18.1.0

Browse Source
This commit is contained in:
Markus Isberg
2022-05-13 22:55:07 +09:00
parent 7547a9b78a
commit d4f6f4cf88
32 changed files with 1263 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs
+2 -1
View File
@@ -2425,7 +2425,8 @@ namespace Barotrauma
verificationTextTag: GameMain.GameSession == null ? "PauseMenuQuitVerificationEditor" : "PauseMenuQuitVerification",
action: () =>
{
GameMain.QuitToMainMenu(save: false);
// In the first campaign round we need to save the start items.
GameMain.QuitToMainMenu(save: GameMain.GameSession.GameMode is SinglePlayerCampaign campaign && campaign.IsFirstRound);
});
}
else
Barotrauma/BarotraumaClient/ClientSource/GUI/GUIContextMenu.cs
+2 -2
View File
@@ -290,7 +290,7 @@ namespace Barotrauma
public override void AddToGUIUpdateList(bool ignoreChildren = false, int order = 0)
{
base.AddToGUIUpdateList(ignoreChildren, order);
SubMenu?.AddToGUIUpdateList();
SubMenu?.AddToGUIUpdateList(order: 2);
}
public static void AddActiveToGUIUpdateList()
@@ -300,7 +300,7 @@ namespace Barotrauma
CurrentContextMenu = null;
}
CurrentContextMenu?.AddToGUIUpdateList();
CurrentContextMenu?.AddToGUIUpdateList(order: 2);
}
}
}
Barotrauma/BarotraumaClient/ClientSource/GUI/TabMenu.cs
+3 -3
View File
@@ -67,7 +67,7 @@ namespace Barotrauma
this.frame = frame;
this.permissionIcon = permissionIcon;
character = client?.Character;
wasCharacterAlive = client.Character != null && !client.Character.IsDead;
wasCharacterAlive = client?.Character != null && !client.Character.IsDead;
}
public LinkedGUI(Character character, GUIFrame frame, GUITextBlock textBlock)
@@ -1253,8 +1253,8 @@ namespace Barotrauma
if (!hasMoneyPermissions && GameMain.Client?.ServerSettings is { } serverSettings)
{
transferAmountInput.MaxValueInt = Math.Min(maxValue, serverSettings.MaximumTransferRequest);
if (serverSettings.MaximumTransferRequest <= 0)
transferAmountInput.MaxValueInt = Math.Min(maxValue, serverSettings.MaximumMoneyTransferRequest);
if (serverSettings.MaximumMoneyTransferRequest <= 0)
{
transferAmountInput.Enabled = false;
transferAmountInput.ToolTip = TextManager.Get("wallettransferrequestdisabled");