v1.3.0.1 (Epic Store release)

This commit is contained in:
Regalis11
2024-03-28 18:34:33 +02:00
parent 81ca8637be
commit 3791670c42
269 changed files with 13160 additions and 2966 deletions
@@ -84,8 +84,21 @@ namespace Barotrauma
Console.WriteLine("Loading game settings");
GameSettings.Init();
Console.WriteLine("Initializing SteamManager");
SteamManager.Initialize();
//no owner key = dedicated server
if (!CommandLineArgs.Any(a => a.Trim().Equals("-ownerkey", StringComparison.OrdinalIgnoreCase)))
{
Console.WriteLine("Initializing SteamManager");
SteamManager.Initialize();
if (!SteamManager.SteamworksLibExists)
{
Console.WriteLine("Initializing EosManager");
if (EosInterface.Core.Init(EosInterface.ApplicationCredentials.Server, enableOverlay: false).TryUnwrapFailure(out var initError))
{
Console.WriteLine($"EOS failed to initialize: {initError}");
}
}
}
//TODO: figure out how consent is supposed to work for servers
//Console.WriteLine("Initializing GameAnalytics");
@@ -137,8 +150,8 @@ namespace Barotrauma
bool enableUpnp = false;
int maxPlayers = 10;
Option<int> ownerKey = Option<int>.None();
Option<SteamId> steamId = Option<SteamId>.None();
Option<int> ownerKey = Option.None;
Option<P2PEndpoint> ownerEndpoint = Option.None;
XDocument doc = XMLExtensions.TryLoadXml(ServerSettings.SettingsFile);
if (doc?.Root == null)
@@ -207,8 +220,8 @@ namespace Barotrauma
}
i++;
break;
case "-steamid":
steamId = SteamId.Parse(CommandLineArgs[i + 1]);
case "-endpoint":
ownerEndpoint = P2PEndpoint.Parse(CommandLineArgs[i + 1]);
i++;
break;
case "-pipes":
@@ -227,7 +240,7 @@ namespace Barotrauma
enableUpnp,
maxPlayers,
ownerKey,
steamId);
ownerEndpoint);
Server.StartServer();
for (int i = 0; i < CommandLineArgs.Length; i++)
@@ -323,6 +336,7 @@ namespace Barotrauma
Server.Update((float)Timing.Step);
if (Server == null) { break; }
SteamManager.Update((float)Timing.Step);
EosInterface.Core.Update();
TaskPool.Update();
CoroutineManager.Update(paused: false, (float)Timing.Step);