latest Steam API doesn't seem to have Init(), it has InitSafe() inste…

…ad (hajimehoshi#6) Latest Steam API doesn't seem to have Init(), it has InitSafe() instead. So call the new function, and still fallback to the old if that is unavailable or fails.
corfe83 · Oct 28, 2023 · 85388dd · 85388dd
1 parent 103842c
commit 85388dd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/gen.go b/gen.go
@@ -12,7 +12,7 @@ import (
 	"os"
 )
 
-const version = "155"
+const version = "158a"
 
 func main() {
 	if err := run(); err != nil {

diff --git a/libsteam_api.dylib b/libsteam_api.dylib
diff --git a/libsteam_api.so b/libsteam_api.so
diff --git a/libsteam_api64.so b/libsteam_api64.so
diff --git a/steamworks.go b/steamworks.go
@@ -87,6 +87,7 @@ type ISteamFriends interface {
 const (
 	flatAPI_RestartAppIfNecessary = "SteamAPI_RestartAppIfNecessary"
 	flatAPI_Init                  = "SteamAPI_Init"
+	flatAPI_InitSafe              = "SteamAPI_InitSafe"
 	flatAPI_RunCallbacks          = "SteamAPI_RunCallbacks"
 
 	flatAPI_SteamApps                         = "SteamAPI_SteamApps_v008"

diff --git a/steamworks_unix.go b/steamworks_unix.go
@@ -241,9 +241,13 @@ func RestartAppIfNecessary(appID uint32) bool {
 }
 
 func Init() bool {
-	v, err := theLib.call(funcType_Bool, flatAPI_Init)
+	v, err := theLib.call(funcType_Bool, flatAPI_InitSafe)
 	if err != nil {
-		panic(err)
+		// If InitSafe() doesn't work for some reason, fallback to Init()
+		v, err = theLib.call(funcType_Bool, flatAPI_Init)
+		if err != nil {
+			panic(err)
+		}
 	}
 	return byte(v) != 0
 }

diff --git a/steamworks_windows.go b/steamworks_windows.go
@@ -80,9 +80,13 @@ func RestartAppIfNecessary(appID uint32) bool {
 }
 
 func Init() bool {
-	v, err := theDLL.call(flatAPI_Init)
+	v, err := theDLL.call(flatAPI_InitSafe)
 	if err != nil {
-		panic(err)
+		// If InitSafe() doesn't work for some reason, fallback to Init()
+		v, err = theDLL.call(flatAPI_Init)
+		if err != nil {
+			panic(err)
+		}
 	}
 	return byte(v) != 0
 }