Skip to content

Commit 0641f37

Browse files
authored
Merge pull request #290 from SourceDotNET/steam
Exit for SteamAPI errors
2 parents 3818afb + 175b30c commit 0641f37

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

‎Source.Engine/Client/SteamAuth.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,19 @@ public class Steam3ClientImpl : IDisposable
8383
[MethodImpl(MethodImplOptions.AggressiveInlining)] public ISteamParentalSettings SteamParentalSettings() => HasSteamClient() ? __SteamParentalSettings : null!;
8484
[MethodImpl(MethodImplOptions.AggressiveInlining)] public ISteamInput SteamInput() => HasSteamClient() ? __SteamInput : null!;
8585

86+
bool Active;
87+
8688
public void Dispose() { }
8789

90+
public void Activate() {
91+
if (Active)
92+
return;
93+
94+
Active = true;
95+
if (SteamAPI.InitEx(out string errMsg) != ESteamAPIInitResult.k_ESteamAPIInitResult_OK)
96+
Sys.Error($"Failed to initialize Steamworks API.\n\n{errMsg}\n\nMake sure Steam is running and is up to date!");
97+
}
98+
8899
public void RunFrame() {
89100
SteamAPI.RunCallbacks();
90101
}

‎Source.Engine/ClientLauncherAPI.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,14 @@ public IClientLauncherAPI.Result RunListenServer() {
8787
public void SetStartupInfo(in StartupInfo info) {
8888
g_pFileSystem.SetWarningFunc(Warning);
8989

90+
startupInfo = info;
9091
Sys.TextMode = info.TextMode;
9192
host_parms.BaseDir = info.BaseDirectory;
92-
startupInfo = info;
93+
94+
#if !SWDS
95+
Steam3Client().Activate();
96+
#endif
97+
9398
COM.InitFilesystem(info.InitialMod);
9499
}
95100

0 commit comments

Comments
 (0)