February update did not unify the versions, in fact just changed to s…

…teamworkss 1.52 (fixes #4)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gmsv_workshop"
-version = "2.2.2"
+version = "2.2.3"
 edition = "2021"
 authors = ["William Venner <[email protected]>"]
 publish = false

lib/steamworks_153a/Readme.txt → lib/steamworks_152/Readme.txt

@@ -8,41 +8,6 @@ Copyright 
 Welcome to the Steamworks SDK.  For documentation please see our partner 
 website at: http://partner.steamgames.com
 
-----------------------------------------------------------------
-v1.53a 11th December 2021
-----------------------------------------------------------------
-
-macOS
-* Fixed libsdkencryptedappticket.dylib to include arm64 support
-
-----------------------------------------------------------------
-v1.53 23th November 2021
-----------------------------------------------------------------
-
-SteamNetworkingSockets:
-* Added support for connections to have multiple streams of messages, known as "lanes," with mechanisms to control bandwidth utilization and head-of-line blocking between lanes.
-* Added the "FakeIP" system, which can be useful to add P2P networking or Steam Datagram Relay support to games while retaining the assumption that network hosts are identified by an IPv4 address.  Added steamnetworkingfakeip.h and ISteamNetworkingFakeUDPPort
-* Simplified interface for iterating config values.
-* Added SteamNetConnectionInfo_t::m_nFlags, which have misc info about a connection.
-
-ISteamInput
-* Added Steam Deck values to the EInputActionOrigin and ESteamInputType origins
-
-ISteamUGC:
-* Added SetTimeCreatedDateRange and SetTimeUpdatedDateRange
-
-ISteamUtils:
-* Added DismissFloatingGamepadTextInput
-
-Flat Interface:
-* For each interface accessor, there is now an inline, unversioned accessor that calls the versioned accessor exported by the .dll.  This reduces the number of changes that need to be made when updating the SDK and accessing the flat interface directly, while still retaining version safety.
-
-General:
-* Removed definitions for many internal callback IDs that are not needed by general users of the SDK.
-
-Spacewar example:
-* Added CItemStore, which demonstrates how to interact with an in-game store
-
 ----------------------------------------------------------------
 v1.52 14th September 2021
 ----------------------------------------------------------------

lib/steamworks_153a/public/steam/isteamcontroller.h → lib/steamworks_152/public/steam/isteamcontroller.h

@@ -373,81 +373,6 @@ enum EControllerActionOrigin
 	k_EControllerActionOrigin_XBoxOne_RightGrip_Upper,
 	k_EControllerActionOrigin_XBoxOne_Share,
 
-	// Added in SDK 1.53
-	k_EControllerActionOrigin_SteamDeck_A,
-	k_EControllerActionOrigin_SteamDeck_B,
-	k_EControllerActionOrigin_SteamDeck_X,
-	k_EControllerActionOrigin_SteamDeck_Y,
-	k_EControllerActionOrigin_SteamDeck_L1,
-	k_EControllerActionOrigin_SteamDeck_R1,
-	k_EControllerActionOrigin_SteamDeck_Menu,
-	k_EControllerActionOrigin_SteamDeck_View,
-	k_EControllerActionOrigin_SteamDeck_LeftPad_Touch,
-	k_EControllerActionOrigin_SteamDeck_LeftPad_Swipe,
-	k_EControllerActionOrigin_SteamDeck_LeftPad_Click,
-	k_EControllerActionOrigin_SteamDeck_LeftPad_DPadNorth,
-	k_EControllerActionOrigin_SteamDeck_LeftPad_DPadSouth,
-	k_EControllerActionOrigin_SteamDeck_LeftPad_DPadWest,
-	k_EControllerActionOrigin_SteamDeck_LeftPad_DPadEast,
-	k_EControllerActionOrigin_SteamDeck_RightPad_Touch,
-	k_EControllerActionOrigin_SteamDeck_RightPad_Swipe,
-	k_EControllerActionOrigin_SteamDeck_RightPad_Click,
-	k_EControllerActionOrigin_SteamDeck_RightPad_DPadNorth,
-	k_EControllerActionOrigin_SteamDeck_RightPad_DPadSouth,
-	k_EControllerActionOrigin_SteamDeck_RightPad_DPadWest,
-	k_EControllerActionOrigin_SteamDeck_RightPad_DPadEast,
-	k_EControllerActionOrigin_SteamDeck_L2_SoftPull,
-	k_EControllerActionOrigin_SteamDeck_L2,
-	k_EControllerActionOrigin_SteamDeck_R2_SoftPull,
-	k_EControllerActionOrigin_SteamDeck_R2,
-	k_EControllerActionOrigin_SteamDeck_LeftStick_Move,
-	k_EControllerActionOrigin_SteamDeck_L3,
-	k_EControllerActionOrigin_SteamDeck_LeftStick_DPadNorth,
-	k_EControllerActionOrigin_SteamDeck_LeftStick_DPadSouth,
-	k_EControllerActionOrigin_SteamDeck_LeftStick_DPadWest,
-	k_EControllerActionOrigin_SteamDeck_LeftStick_DPadEast,
-	k_EControllerActionOrigin_SteamDeck_LeftStick_Touch,
-	k_EControllerActionOrigin_SteamDeck_RightStick_Move,
-	k_EControllerActionOrigin_SteamDeck_R3,
-	k_EControllerActionOrigin_SteamDeck_RightStick_DPadNorth,
-	k_EControllerActionOrigin_SteamDeck_RightStick_DPadSouth,
-	k_EControllerActionOrigin_SteamDeck_RightStick_DPadWest,
-	k_EControllerActionOrigin_SteamDeck_RightStick_DPadEast,
-	k_EControllerActionOrigin_SteamDeck_RightStick_Touch,
-	k_EControllerActionOrigin_SteamDeck_L4,
-	k_EControllerActionOrigin_SteamDeck_R4,
-	k_EControllerActionOrigin_SteamDeck_L5,
-	k_EControllerActionOrigin_SteamDeck_R5,
-	k_EControllerActionOrigin_SteamDeck_DPad_Move,
-	k_EControllerActionOrigin_SteamDeck_DPad_North,
-	k_EControllerActionOrigin_SteamDeck_DPad_South,
-	k_EControllerActionOrigin_SteamDeck_DPad_West,
-	k_EControllerActionOrigin_SteamDeck_DPad_East,
-	k_EControllerActionOrigin_SteamDeck_Gyro_Move,
-	k_EControllerActionOrigin_SteamDeck_Gyro_Pitch,
-	k_EControllerActionOrigin_SteamDeck_Gyro_Yaw,
-	k_EControllerActionOrigin_SteamDeck_Gyro_Roll,
-	k_EControllerActionOrigin_SteamDeck_Reserved1,
-	k_EControllerActionOrigin_SteamDeck_Reserved2,
-	k_EControllerActionOrigin_SteamDeck_Reserved3,
-	k_EControllerActionOrigin_SteamDeck_Reserved4,
-	k_EControllerActionOrigin_SteamDeck_Reserved5,
-	k_EControllerActionOrigin_SteamDeck_Reserved6,
-	k_EControllerActionOrigin_SteamDeck_Reserved7,
-	k_EControllerActionOrigin_SteamDeck_Reserved8,
-	k_EControllerActionOrigin_SteamDeck_Reserved9,
-	k_EControllerActionOrigin_SteamDeck_Reserved10,
-	k_EControllerActionOrigin_SteamDeck_Reserved11,
-	k_EControllerActionOrigin_SteamDeck_Reserved12,
-	k_EControllerActionOrigin_SteamDeck_Reserved13,
-	k_EControllerActionOrigin_SteamDeck_Reserved14,
-	k_EControllerActionOrigin_SteamDeck_Reserved15,
-	k_EControllerActionOrigin_SteamDeck_Reserved16,
-	k_EControllerActionOrigin_SteamDeck_Reserved17,
-	k_EControllerActionOrigin_SteamDeck_Reserved18,
-	k_EControllerActionOrigin_SteamDeck_Reserved19,
-	k_EControllerActionOrigin_SteamDeck_Reserved20,
-
 	k_EControllerActionOrigin_Count, // If Steam has added support for new controllers origins will go here.
 	k_EControllerActionOrigin_MaximumPossibleValue = 32767, // Origins are currently a maximum of 16 bits.
 };

lib/steamworks_153a/public/steam/isteamhttp.h → lib/steamworks_152/public/steam/isteamhttp.h

@@ -161,7 +161,7 @@ STEAM_DEFINE_GAMESERVER_INTERFACE_ACCESSOR( ISteamHTTP *, SteamGameServerHTTP, S
 
 struct HTTPRequestCompleted_t
 {
-	enum { k_iCallback = k_iSteamHTTPCallbacks + 1 };
+	enum { k_iCallback = k_iClientHTTPCallbacks + 1 };
 
 	// Handle value for the request that has completed.
 	HTTPRequestHandle m_hRequest;
@@ -184,7 +184,7 @@ struct HTTPRequestCompleted_t
 
 struct HTTPRequestHeadersReceived_t
 {
-	enum { k_iCallback = k_iSteamHTTPCallbacks + 2 };
+	enum { k_iCallback = k_iClientHTTPCallbacks + 2 };
 
 	// Handle value for the request that has received headers.
 	HTTPRequestHandle m_hRequest;
@@ -196,7 +196,7 @@ struct HTTPRequestHeadersReceived_t
 
 struct HTTPRequestDataReceived_t
 {
-	enum { k_iCallback = k_iSteamHTTPCallbacks + 3 };
+	enum { k_iCallback = k_iClientHTTPCallbacks + 3 };
 
 	// Handle value for the request that has received data.
 	HTTPRequestHandle m_hRequest;

lib/steamworks_153a/public/steam/isteaminput.h → lib/steamworks_152/public/steam/isteaminput.h

@@ -407,81 +407,6 @@ enum EInputActionOrigin
 	k_EInputActionOrigin_PS5_Reserved19,
 	k_EInputActionOrigin_PS5_Reserved20,
 
-	// Added in SDK 1.53
-	k_EInputActionOrigin_SteamDeck_A,
-	k_EInputActionOrigin_SteamDeck_B,
-	k_EInputActionOrigin_SteamDeck_X,
-	k_EInputActionOrigin_SteamDeck_Y,
-	k_EInputActionOrigin_SteamDeck_L1,
-	k_EInputActionOrigin_SteamDeck_R1,
-	k_EInputActionOrigin_SteamDeck_Menu,
-	k_EInputActionOrigin_SteamDeck_View,
-	k_EInputActionOrigin_SteamDeck_LeftPad_Touch,
-	k_EInputActionOrigin_SteamDeck_LeftPad_Swipe,
-	k_EInputActionOrigin_SteamDeck_LeftPad_Click,
-	k_EInputActionOrigin_SteamDeck_LeftPad_DPadNorth,
-	k_EInputActionOrigin_SteamDeck_LeftPad_DPadSouth,
-	k_EInputActionOrigin_SteamDeck_LeftPad_DPadWest,
-	k_EInputActionOrigin_SteamDeck_LeftPad_DPadEast,
-	k_EInputActionOrigin_SteamDeck_RightPad_Touch,
-	k_EInputActionOrigin_SteamDeck_RightPad_Swipe,
-	k_EInputActionOrigin_SteamDeck_RightPad_Click,
-	k_EInputActionOrigin_SteamDeck_RightPad_DPadNorth,
-	k_EInputActionOrigin_SteamDeck_RightPad_DPadSouth,
-	k_EInputActionOrigin_SteamDeck_RightPad_DPadWest,
-	k_EInputActionOrigin_SteamDeck_RightPad_DPadEast,
-	k_EInputActionOrigin_SteamDeck_L2_SoftPull,
-	k_EInputActionOrigin_SteamDeck_L2,
-	k_EInputActionOrigin_SteamDeck_R2_SoftPull,
-	k_EInputActionOrigin_SteamDeck_R2,
-	k_EInputActionOrigin_SteamDeck_LeftStick_Move,
-	k_EInputActionOrigin_SteamDeck_L3,
-	k_EInputActionOrigin_SteamDeck_LeftStick_DPadNorth,
-	k_EInputActionOrigin_SteamDeck_LeftStick_DPadSouth,
-	k_EInputActionOrigin_SteamDeck_LeftStick_DPadWest,
-	k_EInputActionOrigin_SteamDeck_LeftStick_DPadEast,
-	k_EInputActionOrigin_SteamDeck_LeftStick_Touch,
-	k_EInputActionOrigin_SteamDeck_RightStick_Move,
-	k_EInputActionOrigin_SteamDeck_R3,
-	k_EInputActionOrigin_SteamDeck_RightStick_DPadNorth,
-	k_EInputActionOrigin_SteamDeck_RightStick_DPadSouth,
-	k_EInputActionOrigin_SteamDeck_RightStick_DPadWest,
-	k_EInputActionOrigin_SteamDeck_RightStick_DPadEast,
-	k_EInputActionOrigin_SteamDeck_RightStick_Touch,
-	k_EInputActionOrigin_SteamDeck_L4,
-	k_EInputActionOrigin_SteamDeck_R4,
-	k_EInputActionOrigin_SteamDeck_L5,
-	k_EInputActionOrigin_SteamDeck_R5,
-	k_EInputActionOrigin_SteamDeck_DPad_Move,
-	k_EInputActionOrigin_SteamDeck_DPad_North,
-	k_EInputActionOrigin_SteamDeck_DPad_South,
-	k_EInputActionOrigin_SteamDeck_DPad_West,
-	k_EInputActionOrigin_SteamDeck_DPad_East,
-	k_EInputActionOrigin_SteamDeck_Gyro_Move,
-	k_EInputActionOrigin_SteamDeck_Gyro_Pitch,
-	k_EInputActionOrigin_SteamDeck_Gyro_Yaw,
-	k_EInputActionOrigin_SteamDeck_Gyro_Roll,
-	k_EInputActionOrigin_SteamDeck_Reserved1,
-	k_EInputActionOrigin_SteamDeck_Reserved2,
-	k_EInputActionOrigin_SteamDeck_Reserved3,
-	k_EInputActionOrigin_SteamDeck_Reserved4,
-	k_EInputActionOrigin_SteamDeck_Reserved5,
-	k_EInputActionOrigin_SteamDeck_Reserved6,
-	k_EInputActionOrigin_SteamDeck_Reserved7,
-	k_EInputActionOrigin_SteamDeck_Reserved8,
-	k_EInputActionOrigin_SteamDeck_Reserved9,
-	k_EInputActionOrigin_SteamDeck_Reserved10,
-	k_EInputActionOrigin_SteamDeck_Reserved11,
-	k_EInputActionOrigin_SteamDeck_Reserved12,
-	k_EInputActionOrigin_SteamDeck_Reserved13,
-	k_EInputActionOrigin_SteamDeck_Reserved14,
-	k_EInputActionOrigin_SteamDeck_Reserved15,
-	k_EInputActionOrigin_SteamDeck_Reserved16,
-	k_EInputActionOrigin_SteamDeck_Reserved17,
-	k_EInputActionOrigin_SteamDeck_Reserved18,
-	k_EInputActionOrigin_SteamDeck_Reserved19,
-	k_EInputActionOrigin_SteamDeck_Reserved20,
-
 	k_EInputActionOrigin_Count, // If Steam has added support for new controllers origins will go here.
 	k_EInputActionOrigin_MaximumPossibleValue = 32767, // Origins are currently a maximum of 16 bits.
 };
@@ -555,7 +480,6 @@ enum ESteamInputType
 	k_ESteamInputType_MobileTouch,			// Steam Link App On-screen Virtual Controller
 	k_ESteamInputType_PS3Controller,		// Currently uses PS4 Origins
 	k_ESteamInputType_PS5Controller,		// Added in SDK 151
-	k_ESteamInputType_SteamDeckController,	// Added in SDK 153
 	k_ESteamInputType_Count,
 	k_ESteamInputType_MaximumPossibleValue = 255,
 };
@@ -582,24 +506,9 @@ enum ESteamInputLEDFlag
 // These values are passed into GetGlyphPNGForActionOrigin
 enum ESteamInputGlyphSize
 {
-	k_ESteamInputGlyphSize_Small,	// 32x32 pixels
-	k_ESteamInputGlyphSize_Medium,	// 128x128 pixels
-	k_ESteamInputGlyphSize_Large,	// 256x256 pixels
-	k_ESteamInputGlyphSize_Count,
-};
-
-enum ESteamInputGlyphStyle
-{
-	// Base-styles - cannot mix
-	ESteamInputGlyphStyle_Knockout 	= 0x0, // Face buttons will have colored labels/outlines on a knocked out background
-										   // Rest of inputs will have white detail/borders on a knocked out background
-	ESteamInputGlyphStyle_Light		= 0x1, // Black detail/borders on a white background
-	ESteamInputGlyphStyle_Dark 		= 0x2, // White detail/borders on a black background
-
-	// Modifiers
-	// Default ABXY/PS equivalent glyphs have a solid fill w/ color matching the physical buttons on the device
-	ESteamInputGlyphStyle_NeutralColorABXY 	= 0x10, // ABXY Buttons will match the base style color instead of their normal associated color
-	ESteamInputGlyphStyle_SolidABXY 		= 0x20,	// ABXY Buttons will have a solid fill
+	k_ESteamInputGlyphSize_Small,
+	k_ESteamInputGlyphSize_Medium,
+	k_ESteamInputGlyphSize_Large,
 };
 
 enum ESteamInputActionEventType
@@ -668,17 +577,15 @@ struct SteamInputActionEvent_t
 {
 	InputHandle_t controllerHandle;
 	ESteamInputActionEventType eEventType;
-	struct AnalogAction_t {
-		InputAnalogActionHandle_t actionHandle;
-		InputAnalogActionData_t analogActionData;
-	};
-	struct DigitalAction_t {
-		InputDigitalActionHandle_t actionHandle;
-		InputDigitalActionData_t digitalActionData;
-	};
 	union {
-		AnalogAction_t analogAction;
-		DigitalAction_t digitalAction;
+		struct {
+			InputAnalogActionHandle_t actionHandle;
+			InputAnalogActionData_t analogActionData;
+		} analogAction;
+		struct {
+			InputDigitalActionHandle_t actionHandle;
+			InputDigitalActionData_t digitalActionData;
+		} digitalAction;
 	};
 };
 
@@ -897,7 +804,7 @@ class ISteamInput
 	virtual uint16 GetSessionInputConfigurationSettings() = 0;
 };
 
-#define STEAMINPUT_INTERFACE_VERSION "SteamInput006"
+#define STEAMINPUT_INTERFACE_VERSION "SteamInput005"
 
 // Global interface accessor
 inline ISteamInput *SteamInput();

lib/steamworks_153a/public/steam/isteaminventory.h → lib/steamworks_152/public/steam/isteaminventory.h

@@ -372,7 +372,7 @@ STEAM_DEFINE_GAMESERVER_INTERFACE_ACCESSOR( ISteamInventory *, SteamGameServerIn
 // always be exactly one callback per handle.
 struct SteamInventoryResultReady_t
 {
-	enum { k_iCallback = k_iSteamInventoryCallbacks + 0 };
+	enum { k_iCallback = k_iClientInventoryCallbacks + 0 };
 	SteamInventoryResult_t m_handle;
 	EResult m_result;
 };
@@ -387,7 +387,7 @@ struct SteamInventoryResultReady_t
 // afterwards; this is an additional notification for your convenience.
 struct SteamInventoryFullUpdate_t
 {
-	enum { k_iCallback = k_iSteamInventoryCallbacks + 1 };
+	enum { k_iCallback = k_iClientInventoryCallbacks + 1 };
 	SteamInventoryResult_t m_handle;
 };
 
@@ -398,13 +398,13 @@ struct SteamInventoryFullUpdate_t
 // a definition update in order to process results from the server.
 struct SteamInventoryDefinitionUpdate_t
 {
-	enum { k_iCallback = k_iSteamInventoryCallbacks + 2 };
+	enum { k_iCallback = k_iClientInventoryCallbacks + 2 };
 };
 
 // Returned 
 struct SteamInventoryEligiblePromoItemDefIDs_t
 {
-	enum { k_iCallback = k_iSteamInventoryCallbacks + 3 };
+	enum { k_iCallback = k_iClientInventoryCallbacks + 3 };
 	EResult m_result;
 	CSteamID m_steamID;
 	int m_numEligiblePromoItemDefs;
@@ -414,7 +414,7 @@ struct SteamInventoryEligiblePromoItemDefIDs_t
 // Triggered from StartPurchase call
 struct SteamInventoryStartPurchaseResult_t
 {
-	enum { k_iCallback = k_iSteamInventoryCallbacks + 4 };
+	enum { k_iCallback = k_iClientInventoryCallbacks + 4 };
 	EResult m_result;
 	uint64 m_ulOrderID;
 	uint64 m_ulTransID;
@@ -424,7 +424,7 @@ struct SteamInventoryStartPurchaseResult_t
 // Triggered from RequestPrices
 struct SteamInventoryRequestPricesResult_t
 {
-	enum { k_iCallback = k_iSteamInventoryCallbacks + 5 };
+	enum { k_iCallback = k_iClientInventoryCallbacks + 5 };
 	EResult m_result;
 	char m_rgchCurrency[4];
 };

lib/steamworks_153a/public/steam/isteamnetworkingmessages.h → lib/steamworks_152/public/steam/isteamnetworkingmessages.h

@@ -73,12 +73,10 @@ class ISteamNetworkingMessages
 	///
 	/// Returns:
 	/// - k_EREsultOK on success.
-	/// - k_EResultNoConnection, if the session has failed or was closed by the peer and
-	///   k_nSteamNetworkingSend_AutoRestartBrokenSession was not specified.  (You can
-	///   use GetSessionConnectionInfo to get the details.)  In order to acknowledge the
-	///   broken session and start a new one, you must call CloseSessionWithUser, or you may
-	///   repeat the call with k_nSteamNetworkingSend_AutoRestartBrokenSession.  See
-	///   k_nSteamNetworkingSend_AutoRestartBrokenSession for more details.
+	/// - k_EResultNoConnection will be returned if the session has failed or was closed by the peer,
+	///   and k_nSteamNetworkingSend_AutoRestartBrokenSession is not used.  (You can use
+	///   GetSessionConnectionInfo to get the details.)  In order to acknowledge the broken session
+	///   and start a new one, you must call CloseSessionWithUser
 	/// - See ISteamNetworkingSockets::SendMessageToConnection for more possible return values
 	virtual EResult SendMessageToUser( const SteamNetworkingIdentity &identityRemote, const void *pubData, uint32 cubData, int nSendFlags, int nRemoteChannel ) = 0;
 
@@ -122,7 +120,7 @@ class ISteamNetworkingMessages
 	/// you do not need the corresponding details.  Note that sessions time out after a while,
 	/// so if a connection fails, or SendMessageToUser returns k_EResultNoConnection, you cannot wait
 	/// indefinitely to obtain the reason for failure.
-	virtual ESteamNetworkingConnectionState GetSessionConnectionInfo( const SteamNetworkingIdentity &identityRemote, SteamNetConnectionInfo_t *pConnectionInfo, SteamNetConnectionRealTimeStatus_t *pQuickStatus ) = 0;
+	virtual ESteamNetworkingConnectionState GetSessionConnectionInfo( const SteamNetworkingIdentity &identityRemote, SteamNetConnectionInfo_t *pConnectionInfo, SteamNetworkingQuickConnectionStatus *pQuickStatus ) = 0;
 };
 #define STEAMNETWORKINGMESSAGES_INTERFACE_VERSION "SteamNetworkingMessages002"