Able to send messages with any SteamNetworkingIdentity type

djdron · zpostfacto · commit c26ff7cb0780 · 2022-01-27T15:02:17.000-08:00
diff --git a/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.cpp b/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.cpp
@@ -416,16 +416,10 @@ CSteamNetworkingMessages::~CSteamNetworkingMessages()
 
 EResult CSteamNetworkingMessages::SendMessageToUser( const SteamNetworkingIdentity &identityRemote, const void *pubData, uint32 cubData, int nSendFlags, int nRemoteChannel )
 {
-	// FIXME SteamNetworkingIdentity
-	if ( identityRemote.GetSteamID64() == 0 )
+	if ( identityRemote.IsInvalid() )
 	{
-		AssertMsg1( false, "Identity %s isn't valid for Messages sessions.  (Only SteamIDs currently supported).", SteamNetworkingIdentityRender( identityRemote ).c_str() );
-		return k_EResultInvalidSteamID;
-	}
-	if ( !IsValidSteamIDForIdentity( identityRemote.GetSteamID() ) )
-	{
-		AssertMsg1( false, "%s isn't valid SteamID for identity.", identityRemote.GetSteamID().Render() );
-		return k_EResultInvalidSteamID;
+		AssertMsg( false, "Identity isn't valid for Messages sessions." );
+		return k_EResultFail;
 	}
 
 	SteamNetworkingGlobalLock scopeLock( "SendMessageToUser" ); // !SPEED! Can we avoid this?

Original file line number	Diff line number	Diff line change
`@@ -416,16 +416,10 @@ CSteamNetworkingMessages::~CSteamNetworkingMessages()`
`416`	`416`
`417`	`417`	`EResult CSteamNetworkingMessages::SendMessageToUser( const SteamNetworkingIdentity &identityRemote, const void *pubData, uint32 cubData, int nSendFlags, int nRemoteChannel )`
`418`	`418`	`{`
`419`		`- // FIXME SteamNetworkingIdentity`
`420`		`- if ( identityRemote.GetSteamID64() == 0 )`
	`419`	`+ if ( identityRemote.IsInvalid() )`
`421`	`420`	`{`
`422`		`- AssertMsg1( false, "Identity %s isn't valid for Messages sessions. (Only SteamIDs currently supported).", SteamNetworkingIdentityRender( identityRemote ).c_str() );`
`423`		`- return k_EResultInvalidSteamID;`
`424`		`- }`
`425`		`- if ( !IsValidSteamIDForIdentity( identityRemote.GetSteamID() ) )`
`426`		`- {`
`427`		`- AssertMsg1( false, "%s isn't valid SteamID for identity.", identityRemote.GetSteamID().Render() );`
`428`		`- return k_EResultInvalidSteamID;`
	`421`	`+ AssertMsg( false, "Identity isn't valid for Messages sessions." );`
	`422`	`+ return k_EResultFail;`
`429`	`423`	`}`
`430`	`424`
`431`	`425`	`SteamNetworkingGlobalLock scopeLock( "SendMessageToUser" ); // !SPEED! Can we avoid this?`