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

(3e2eaf696) Fixed "mission failed" text still appearing in other languages due to TextManager automatically returning an English text if a text cannot be found in the selected language

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-18 17:55:21 +03:00
parent 8fec6cae81
commit 305fa484ad
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
-16
View File
@@ -218,22 +218,6 @@ namespace Barotrauma
return true; return true;
} }
private bool RefreshJoinButtonState(GUIComponent component, object obj)
{
if (obj == null || waitingForRefresh) { return false; }
if (!string.IsNullOrWhiteSpace(clientNameBox.Text) && !string.IsNullOrWhiteSpace(ipBox.Text))
{
joinButton.Enabled = true;
}
else
{
joinButton.Enabled = false;
}
return true;
}
private bool SelectServer(GUIComponent component, object obj) private bool SelectServer(GUIComponent component, object obj)
{ {
if (obj == null || waitingForRefresh) { return false; } if (obj == null || waitingForRefresh) { return false; }
Barotrauma/BarotraumaShared/Source/Events/Missions/MissionPrefab.cs
+9 -5
View File
@@ -83,11 +83,15 @@ namespace Barotrauma
Commonness = element.GetAttributeInt("commonness", 1); Commonness = element.GetAttributeInt("commonness", 1);
SuccessMessage = TextManager.Get("MissionSuccess." + Identifier, true) ?? element.GetAttributeString("successmessage", "Mission completed successfully"); SuccessMessage = TextManager.Get("MissionSuccess." + Identifier, true) ?? element.GetAttributeString("successmessage", "Mission completed successfully");
FailureMessage = FailureMessage = TextManager.Get("MissionFailure." + Identifier, true) ?? "";
TextManager.Get("MissionFailure." + Identifier, true) ?? if (string.IsNullOrEmpty(FailureMessage) && TextManager.ContainsTag("missionfailed"))
element.GetAttributeString("failuremessage", null) ?? {
TextManager.Get("missionfailed", returnNull: true) ?? FailureMessage = TextManager.Get("missionfailed", returnNull: true) ?? "";
""; }
if (string.IsNullOrEmpty(FailureMessage) && GameMain.Config.Language == "English")
{
FailureMessage = element.GetAttributeString("failuremessage", "");
}
SonarLabel = TextManager.Get("MissionSonarLabel." + Identifier, true) ?? element.GetAttributeString("sonarlabel", ""); SonarLabel = TextManager.Get("MissionSonarLabel." + Identifier, true) ?? element.GetAttributeString("sonarlabel", "");