Build 0.20.0.0

This commit is contained in:
Markus Isberg
2022-10-27 17:54:57 +03:00
parent 05c7b1f869
commit edaf4b09fe
197 changed files with 4344 additions and 1773 deletions
@@ -13,7 +13,7 @@ namespace Barotrauma
Yes
}
protected LanguageIdentifier language { get; private set; } = LanguageIdentifier.None;
public LanguageIdentifier Language { get; private set; } = LanguageIdentifier.None;
private int languageVersion = 0;
protected string cachedValue = "";
@@ -32,13 +32,13 @@ namespace Barotrauma
protected void UpdateLanguage()
{
language = GameSettings.CurrentConfig.Language;
Language = GameSettings.CurrentConfig.Language;
languageVersion = TextManager.LanguageVersion;
}
protected virtual bool MustRetrieveValue() //this can't be called on other LocalizedStrings by derived classes
{
return language != GameSettings.CurrentConfig.Language || languageVersion != TextManager.LanguageVersion;
return Language != GameSettings.CurrentConfig.Language || languageVersion != TextManager.LanguageVersion;
}
protected static bool MustRetrieveValue(LocalizedString str) //this can be called by derived classes
@@ -54,10 +54,10 @@ namespace Barotrauma
return (loaded ? candidates.GetRandomUnsynced() : "", loaded);
}
var (value, loaded) = tryLoad(language);
var (value, loaded) = tryLoad(Language);
loadedSuccessfully = loaded ? LoadedSuccessfully.Yes : LoadedSuccessfully.No;
cachedValue = value;
if (!loaded && language != TextManager.DefaultLanguage)
if (!loaded && Language != TextManager.DefaultLanguage)
{
(value, _) = tryLoad(TextManager.DefaultLanguage);
cachedValue = value;