diff --git a/Source.Engine/Client/SteamAuth.cs b/Source.Engine/Client/SteamAuth.cs index b66b257d..417abeff 100644 --- a/Source.Engine/Client/SteamAuth.cs +++ b/Source.Engine/Client/SteamAuth.cs @@ -83,8 +83,19 @@ public class Steam3ClientImpl : IDisposable [MethodImpl(MethodImplOptions.AggressiveInlining)] public ISteamParentalSettings SteamParentalSettings() => HasSteamClient() ? __SteamParentalSettings : null!; [MethodImpl(MethodImplOptions.AggressiveInlining)] public ISteamInput SteamInput() => HasSteamClient() ? __SteamInput : null!; + bool Active; + public void Dispose() { } + public void Activate() { + if (Active) + return; + + Active = true; + if (SteamAPI.InitEx(out string errMsg) != ESteamAPIInitResult.k_ESteamAPIInitResult_OK) + Sys.Error($"Failed to initialize Steamworks API.\n\n{errMsg}\n\nMake sure Steam is running and is up to date!"); + } + public void RunFrame() { SteamAPI.RunCallbacks(); } diff --git a/Source.Engine/ClientLauncherAPI.cs b/Source.Engine/ClientLauncherAPI.cs index a754f168..1fcef371 100644 --- a/Source.Engine/ClientLauncherAPI.cs +++ b/Source.Engine/ClientLauncherAPI.cs @@ -87,9 +87,14 @@ public IClientLauncherAPI.Result RunListenServer() { public void SetStartupInfo(in StartupInfo info) { g_pFileSystem.SetWarningFunc(Warning); + startupInfo = info; Sys.TextMode = info.TextMode; host_parms.BaseDir = info.BaseDirectory; - startupInfo = info; + +#if !SWDS + Steam3Client().Activate(); +#endif + COM.InitFilesystem(info.InitialMod); }