Unstable v0.15.17.0 (Hex is out of town edition)
This commit is contained in:
@@ -757,25 +757,6 @@ namespace Barotrauma
|
||||
|
||||
public bool CampaignDisclaimerShown, EditorDisclaimerShown;
|
||||
|
||||
private static bool sendUserStatistics = true;
|
||||
public static bool SendUserStatistics
|
||||
{
|
||||
get
|
||||
{
|
||||
return false;
|
||||
/*#if DEBUG
|
||||
return false;
|
||||
#endif
|
||||
return sendUserStatistics;*/
|
||||
}
|
||||
set
|
||||
{
|
||||
sendUserStatistics = value;
|
||||
GameMain.Config.SaveNewPlayerConfig();
|
||||
}
|
||||
}
|
||||
public static bool ShowUserStatisticsPrompt { get; set; }
|
||||
|
||||
public bool ShowLanguageSelectionPrompt { get; set; }
|
||||
|
||||
public static bool ShowOffensiveServerPrompt { get; set; }
|
||||
@@ -858,7 +839,6 @@ namespace Barotrauma
|
||||
if (!fileFound)
|
||||
{
|
||||
ShowLanguageSelectionPrompt = true;
|
||||
ShowUserStatisticsPrompt = true;
|
||||
SaveNewPlayerConfig();
|
||||
}
|
||||
}
|
||||
@@ -870,9 +850,8 @@ namespace Barotrauma
|
||||
private bool LoadPlayerConfigInternal()
|
||||
{
|
||||
XDocument doc = XMLExtensions.LoadXml(PlayerSavePath);
|
||||
if (doc == null || doc.Root == null)
|
||||
if (doc?.Root == null)
|
||||
{
|
||||
ShowUserStatisticsPrompt = true;
|
||||
ShowTutorialSkipWarning = true;
|
||||
return false;
|
||||
}
|
||||
@@ -989,12 +968,7 @@ namespace Barotrauma
|
||||
if (!string.IsNullOrEmpty(overrideMultiplayerSaveFolder))
|
||||
{
|
||||
doc.Root.Add(new XAttribute("overridemultiplayersavefolder", overrideMultiplayerSaveFolder));
|
||||
}
|
||||
|
||||
if (!ShowUserStatisticsPrompt)
|
||||
{
|
||||
doc.Root.Add(new XAttribute("senduserstatistics", sendUserStatistics));
|
||||
}
|
||||
}
|
||||
|
||||
XElement gMode = doc.Root.Element("graphicsmode");
|
||||
if (gMode == null)
|
||||
@@ -1194,7 +1168,7 @@ namespace Barotrauma
|
||||
catch (Exception e)
|
||||
{
|
||||
DebugConsole.ThrowError("Saving game settings failed.", e);
|
||||
GameAnalyticsManager.AddErrorEventOnce("GameSettings.Save:SaveFailed", GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
|
||||
GameAnalyticsManager.AddErrorEventOnce("GameSettings.Save:SaveFailed", GameAnalyticsManager.ErrorSeverity.Error,
|
||||
"Saving game settings failed.\n" + e.Message + "\n" + e.StackTrace.CleanupStackTrace());
|
||||
return false;
|
||||
}
|
||||
@@ -1211,7 +1185,6 @@ namespace Barotrauma
|
||||
Language = doc.Root.GetAttributeString("language", Language);
|
||||
}
|
||||
AutoCheckUpdates = doc.Root.GetAttributeBool("autocheckupdates", AutoCheckUpdates);
|
||||
sendUserStatistics = doc.Root.GetAttributeBool("senduserstatistics", sendUserStatistics);
|
||||
QuickStartSubmarineName = doc.Root.GetAttributeString("quickstartsub", QuickStartSubmarineName);
|
||||
EnableSubmarineAutoSave = doc.Root.GetAttributeBool("submarineautosave", true);
|
||||
MaximumAutoSaves = doc.Root.GetAttributeInt("maxautosaves", 8);
|
||||
|
||||
Reference in New Issue
Block a user