v1.5.7.0 (Summer Update)

This commit is contained in:
Regalis11
2024-06-18 16:49:51 +03:00
parent 4a63dacbce
commit 230d1b6e78
263 changed files with 7792 additions and 2845 deletions
@@ -8,8 +8,12 @@ namespace Barotrauma
public bool PrimaryIsLoaded { get; private set; }
public FallbackLString(LocalizedString primary, LocalizedString fallback)
private readonly bool useDefaultLanguageIfFound;
/// <param name="useDefaultLanguageIfFound">If the text is available in the default language (English), should it be used instead of this fallback?</param>
public FallbackLString(LocalizedString primary, LocalizedString fallback, bool useDefaultLanguageIfFound = true)
{
this.useDefaultLanguageIfFound = useDefaultLanguageIfFound;
if (primary is FallbackLString { primary: { } innerPrimary, fallback: { } innerFallback })
{
this.primary = innerPrimary;
@@ -35,7 +39,11 @@ namespace Barotrauma
{
cachedValue = primary.Value;
PrimaryIsLoaded = primary.Loaded;
if (!primary.Loaded)
bool defaultLanguageFallbackAvailable = primary is TagLString { UsingDefaultLanguageAsFallback: true };
if (!primary.Loaded &&
(!defaultLanguageFallbackAvailable || !useDefaultLanguageIfFound))
{
cachedValue = fallback.Value;
}