Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master

Barotrauma/BarotraumaServer/ServerSource/GameMain.cs

@@ -1,7 +1,6 @@
 using Barotrauma.Networking;
 using Barotrauma.Steam;
 using FarseerPhysics.Dynamics;
-using GameAnalyticsSDK.Net;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -101,8 +100,9 @@ namespace Barotrauma
 
             Console.WriteLine("Initializing SteamManager");
             SteamManager.Initialize();
-            Console.WriteLine("Initializing GameAnalytics");
-            if (GameSettings.SendUserStatistics) GameAnalyticsManager.Init();
+            //TODO: figure out how consent is supposed to work for servers
+            //Console.WriteLine("Initializing GameAnalytics");
+            //GameAnalyticsManager.InitIfConsented();
 
             Console.WriteLine("Initializing GameScreen");
             GameScreen = new GameScreen();
@@ -438,8 +438,8 @@ namespace Barotrauma
 
             SaveUtil.CleanUnnecessarySaveFiles();
 
-            if (GameSettings.SaveDebugConsoleLogs) { DebugConsole.SaveLogs(); }
-            if (GameSettings.SendUserStatistics) { GameAnalytics.OnQuit(); }
+            if (GameSettings.SaveDebugConsoleLogs || GameSettings.VerboseLogging) { DebugConsole.SaveLogs(); }
+            if (GameAnalyticsManager.SendUserStatistics) { GameAnalyticsManager.ShutDown(); }
 
             MainThread = null;
         }
@@ -451,7 +451,7 @@ namespace Barotrauma
             stopwatch?.Start();
         }
         
-        public CoroutineHandle ShowLoading(IEnumerable<object> loader, bool waitKeyHit = true)
+        public CoroutineHandle ShowLoading(IEnumerable<CoroutineStatus> loader, bool waitKeyHit = true)
         {
             return CoroutineManager.StartCoroutine(loader);
         }