diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs index 4b69970..f41f4ac 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs @@ -19,10 +19,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP")] - private static extern Socket _CreateListenSocketIP( IntPtr self, ref NetAddress localAddress, int nOptions, ref SteamNetworkingConfigValue_t pOptions ); + private static extern Socket _CreateListenSocketIP( IntPtr self, ref NetAddress localAddress, int nOptions, ref NetConfig_t pOptions ); #endregion - internal Socket CreateListenSocketIP( ref NetAddress localAddress, int nOptions, ref SteamNetworkingConfigValue_t pOptions ) + internal Socket CreateListenSocketIP( ref NetAddress localAddress, int nOptions, ref NetConfig_t pOptions ) { var returnValue = _CreateListenSocketIP( Self, ref localAddress, nOptions, ref pOptions ); return returnValue; @@ -30,10 +30,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress")] - private static extern Connection _ConnectByIPAddress( IntPtr self, ref NetAddress address, int nOptions, ref SteamNetworkingConfigValue_t pOptions ); + private static extern Connection _ConnectByIPAddress( IntPtr self, ref NetAddress address, int nOptions, ref NetConfig_t pOptions ); #endregion - internal Connection ConnectByIPAddress( ref NetAddress address, int nOptions, ref SteamNetworkingConfigValue_t pOptions ) + internal Connection ConnectByIPAddress( ref NetAddress address, int nOptions, ref NetConfig_t pOptions ) { var returnValue = _ConnectByIPAddress( Self, ref address, nOptions, ref pOptions ); return returnValue; @@ -41,10 +41,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2P")] - private static extern Socket _CreateListenSocketP2P( IntPtr self, int nVirtualPort, int nOptions, ref SteamNetworkingConfigValue_t pOptions ); + private static extern Socket _CreateListenSocketP2P( IntPtr self, int nVirtualPort, int nOptions, ref NetConfig_t pOptions ); #endregion - internal Socket CreateListenSocketP2P( int nVirtualPort, int nOptions, ref SteamNetworkingConfigValue_t pOptions ) + internal Socket CreateListenSocketP2P( int nVirtualPort, int nOptions, ref NetConfig_t pOptions ) { var returnValue = _CreateListenSocketP2P( Self, nVirtualPort, nOptions, ref pOptions ); return returnValue; @@ -52,10 +52,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConnectP2P")] - private static extern Connection _ConnectP2P( IntPtr self, ref NetIdentity identityRemote, int nVirtualPort, int nOptions, ref SteamNetworkingConfigValue_t pOptions ); + private static extern Connection _ConnectP2P( IntPtr self, ref NetIdentity identityRemote, int nVirtualPort, int nOptions, ref NetConfig_t pOptions ); #endregion - internal Connection ConnectP2P( ref NetIdentity identityRemote, int nVirtualPort, int nOptions, ref SteamNetworkingConfigValue_t pOptions ) + internal Connection ConnectP2P( ref NetIdentity identityRemote, int nVirtualPort, int nOptions, ref NetConfig_t pOptions ) { var returnValue = _ConnectP2P( Self, ref identityRemote, nVirtualPort, nOptions, ref pOptions ); return returnValue; @@ -352,10 +352,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConnectToHostedDedicatedServer")] - private static extern Connection _ConnectToHostedDedicatedServer( IntPtr self, ref NetIdentity identityTarget, int nVirtualPort, int nOptions, ref SteamNetworkingConfigValue_t pOptions ); + private static extern Connection _ConnectToHostedDedicatedServer( IntPtr self, ref NetIdentity identityTarget, int nVirtualPort, int nOptions, ref NetConfig_t pOptions ); #endregion - internal Connection ConnectToHostedDedicatedServer( ref NetIdentity identityTarget, int nVirtualPort, int nOptions, ref SteamNetworkingConfigValue_t pOptions ) + internal Connection ConnectToHostedDedicatedServer( ref NetIdentity identityTarget, int nVirtualPort, int nOptions, ref NetConfig_t pOptions ) { var returnValue = _ConnectToHostedDedicatedServer( Self, ref identityTarget, nVirtualPort, nOptions, ref pOptions ); return returnValue; @@ -396,10 +396,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateHostedDedicatedServerListenSocket")] - private static extern Socket _CreateHostedDedicatedServerListenSocket( IntPtr self, int nVirtualPort, int nOptions, ref SteamNetworkingConfigValue_t pOptions ); + private static extern Socket _CreateHostedDedicatedServerListenSocket( IntPtr self, int nVirtualPort, int nOptions, ref NetConfig_t pOptions ); #endregion - internal Socket CreateHostedDedicatedServerListenSocket( int nVirtualPort, int nOptions, ref SteamNetworkingConfigValue_t pOptions ) + internal Socket CreateHostedDedicatedServerListenSocket( int nVirtualPort, int nOptions, ref NetConfig_t pOptions ) { var returnValue = _CreateHostedDedicatedServerListenSocket( Self, nVirtualPort, nOptions, ref pOptions ); return returnValue; @@ -418,10 +418,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConnectP2PCustomSignaling")] - private static extern Connection _ConnectP2PCustomSignaling( IntPtr self, IntPtr pSignaling, ref NetIdentity pPeerIdentity, int nOptions, ref SteamNetworkingConfigValue_t pOptions ); + private static extern Connection _ConnectP2PCustomSignaling( IntPtr self, IntPtr pSignaling, ref NetIdentity pPeerIdentity, int nOptions, ref NetConfig_t pOptions ); #endregion - internal Connection ConnectP2PCustomSignaling( IntPtr pSignaling, ref NetIdentity pPeerIdentity, int nOptions, ref SteamNetworkingConfigValue_t pOptions ) + internal Connection ConnectP2PCustomSignaling( IntPtr pSignaling, ref NetIdentity pPeerIdentity, int nOptions, ref NetConfig_t pOptions ) { var returnValue = _ConnectP2PCustomSignaling( Self, pSignaling, ref pPeerIdentity, nOptions, ref pOptions ); return returnValue; diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs index eb798c9..31e565b 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs @@ -186,10 +186,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueInt32")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SetGlobalConfigValueInt32( IntPtr self, SteamNetworkingConfigValue eValue, int val ); + private static extern bool _SetGlobalConfigValueInt32( IntPtr self, NetConfig eValue, int val ); #endregion - internal bool SetGlobalConfigValueInt32( SteamNetworkingConfigValue eValue, int val ) + internal bool SetGlobalConfigValueInt32( NetConfig eValue, int val ) { var returnValue = _SetGlobalConfigValueInt32( Self, eValue, val ); return returnValue; @@ -198,10 +198,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueFloat")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SetGlobalConfigValueFloat( IntPtr self, SteamNetworkingConfigValue eValue, float val ); + private static extern bool _SetGlobalConfigValueFloat( IntPtr self, NetConfig eValue, float val ); #endregion - internal bool SetGlobalConfigValueFloat( SteamNetworkingConfigValue eValue, float val ) + internal bool SetGlobalConfigValueFloat( NetConfig eValue, float val ) { var returnValue = _SetGlobalConfigValueFloat( Self, eValue, val ); return returnValue; @@ -210,10 +210,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValueString")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SetGlobalConfigValueString( IntPtr self, SteamNetworkingConfigValue eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string val ); + private static extern bool _SetGlobalConfigValueString( IntPtr self, NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string val ); #endregion - internal bool SetGlobalConfigValueString( SteamNetworkingConfigValue eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string val ) + internal bool SetGlobalConfigValueString( NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string val ) { var returnValue = _SetGlobalConfigValueString( Self, eValue, val ); return returnValue; @@ -222,10 +222,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueInt32")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SetConnectionConfigValueInt32( IntPtr self, Connection hConn, SteamNetworkingConfigValue eValue, int val ); + private static extern bool _SetConnectionConfigValueInt32( IntPtr self, Connection hConn, NetConfig eValue, int val ); #endregion - internal bool SetConnectionConfigValueInt32( Connection hConn, SteamNetworkingConfigValue eValue, int val ) + internal bool SetConnectionConfigValueInt32( Connection hConn, NetConfig eValue, int val ) { var returnValue = _SetConnectionConfigValueInt32( Self, hConn, eValue, val ); return returnValue; @@ -234,10 +234,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueFloat")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SetConnectionConfigValueFloat( IntPtr self, Connection hConn, SteamNetworkingConfigValue eValue, float val ); + private static extern bool _SetConnectionConfigValueFloat( IntPtr self, Connection hConn, NetConfig eValue, float val ); #endregion - internal bool SetConnectionConfigValueFloat( Connection hConn, SteamNetworkingConfigValue eValue, float val ) + internal bool SetConnectionConfigValueFloat( Connection hConn, NetConfig eValue, float val ) { var returnValue = _SetConnectionConfigValueFloat( Self, hConn, eValue, val ); return returnValue; @@ -246,10 +246,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueString")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SetConnectionConfigValueString( IntPtr self, Connection hConn, SteamNetworkingConfigValue eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string val ); + private static extern bool _SetConnectionConfigValueString( IntPtr self, Connection hConn, NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string val ); #endregion - internal bool SetConnectionConfigValueString( Connection hConn, SteamNetworkingConfigValue eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string val ) + internal bool SetConnectionConfigValueString( Connection hConn, NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string val ) { var returnValue = _SetConnectionConfigValueString( Self, hConn, eValue, val ); return returnValue; @@ -258,10 +258,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetConfigValue")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SetConfigValue( IntPtr self, SteamNetworkingConfigValue eValue, SteamNetworkingConfigScope eScopeType, long scopeObj, SteamNetworkingConfigDataType eDataType, IntPtr pArg ); + private static extern bool _SetConfigValue( IntPtr self, NetConfig eValue, SteamNetworkingConfigScope eScopeType, long scopeObj, NetConfigType eDataType, IntPtr pArg ); #endregion - internal bool SetConfigValue( SteamNetworkingConfigValue eValue, SteamNetworkingConfigScope eScopeType, long scopeObj, SteamNetworkingConfigDataType eDataType, IntPtr pArg ) + internal bool SetConfigValue( NetConfig eValue, SteamNetworkingConfigScope eScopeType, long scopeObj, NetConfigType eDataType, IntPtr pArg ) { var returnValue = _SetConfigValue( Self, eValue, eScopeType, scopeObj, eDataType, pArg ); return returnValue; @@ -270,10 +270,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetConfigValueStruct")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SetConfigValueStruct( IntPtr self, ref SteamNetworkingConfigValue_t opt, SteamNetworkingConfigScope eScopeType, long scopeObj ); + private static extern bool _SetConfigValueStruct( IntPtr self, ref NetConfig_t opt, SteamNetworkingConfigScope eScopeType, long scopeObj ); #endregion - internal bool SetConfigValueStruct( ref SteamNetworkingConfigValue_t opt, SteamNetworkingConfigScope eScopeType, long scopeObj ) + internal bool SetConfigValueStruct( ref NetConfig_t opt, SteamNetworkingConfigScope eScopeType, long scopeObj ) { var returnValue = _SetConfigValueStruct( Self, ref opt, eScopeType, scopeObj ); return returnValue; @@ -281,10 +281,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_GetConfigValue")] - private static extern NetConfigResult _GetConfigValue( IntPtr self, SteamNetworkingConfigValue eValue, SteamNetworkingConfigScope eScopeType, long scopeObj, ref SteamNetworkingConfigDataType pOutDataType, IntPtr pResult, ref UIntPtr cbResult ); + private static extern NetConfigResult _GetConfigValue( IntPtr self, NetConfig eValue, SteamNetworkingConfigScope eScopeType, long scopeObj, ref NetConfigType pOutDataType, IntPtr pResult, ref UIntPtr cbResult ); #endregion - internal NetConfigResult GetConfigValue( SteamNetworkingConfigValue eValue, SteamNetworkingConfigScope eScopeType, long scopeObj, ref SteamNetworkingConfigDataType pOutDataType, IntPtr pResult, ref UIntPtr cbResult ) + internal NetConfigResult GetConfigValue( NetConfig eValue, SteamNetworkingConfigScope eScopeType, long scopeObj, ref NetConfigType pOutDataType, IntPtr pResult, ref UIntPtr cbResult ) { var returnValue = _GetConfigValue( Self, eValue, eScopeType, scopeObj, ref pOutDataType, pResult, ref cbResult ); return returnValue; @@ -293,10 +293,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_GetConfigValueInfo")] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _GetConfigValueInfo( IntPtr self, SteamNetworkingConfigValue eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pOutName, ref SteamNetworkingConfigDataType pOutDataType, [In,Out] SteamNetworkingConfigScope[] pOutScope, [In,Out] SteamNetworkingConfigValue[] pOutNextValue ); + private static extern bool _GetConfigValueInfo( IntPtr self, NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pOutName, ref NetConfigType pOutDataType, [In,Out] SteamNetworkingConfigScope[] pOutScope, [In,Out] NetConfig[] pOutNextValue ); #endregion - internal bool GetConfigValueInfo( SteamNetworkingConfigValue eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pOutName, ref SteamNetworkingConfigDataType pOutDataType, [In,Out] SteamNetworkingConfigScope[] pOutScope, [In,Out] SteamNetworkingConfigValue[] pOutNextValue ) + internal bool GetConfigValueInfo( NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pOutName, ref NetConfigType pOutDataType, [In,Out] SteamNetworkingConfigScope[] pOutScope, [In,Out] NetConfig[] pOutNextValue ) { var returnValue = _GetConfigValueInfo( Self, eValue, pOutName, ref pOutDataType, pOutScope, pOutNextValue ); return returnValue; @@ -304,10 +304,10 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_GetFirstConfigValue")] - private static extern SteamNetworkingConfigValue _GetFirstConfigValue( IntPtr self ); + private static extern NetConfig _GetFirstConfigValue( IntPtr self ); #endregion - internal SteamNetworkingConfigValue GetFirstConfigValue() + internal NetConfig GetFirstConfigValue() { var returnValue = _GetFirstConfigValue( Self ); return returnValue; diff --git a/Facepunch.Steamworks/Generated/SteamEnums.cs b/Facepunch.Steamworks/Generated/SteamEnums.cs index cb8987a..f4331bd 100644 --- a/Facepunch.Steamworks/Generated/SteamEnums.cs +++ b/Facepunch.Steamworks/Generated/SteamEnums.cs @@ -2049,7 +2049,7 @@ namespace Steamworks // // ESteamNetworkingConfigDataType // - internal enum SteamNetworkingConfigDataType : int + internal enum NetConfigType : int { _Int32 = 1, _Int64 = 2, @@ -2062,7 +2062,7 @@ namespace Steamworks // // ESteamNetworkingConfigValue // - internal enum SteamNetworkingConfigValue : int + internal enum NetConfig : int { _Invalid = 0, _FakePacketLoss_Send = 2, diff --git a/Facepunch.Steamworks/Generated/SteamStructs.cs b/Facepunch.Steamworks/Generated/SteamStructs.cs index c1a888d..890e9e5 100644 --- a/Facepunch.Steamworks/Generated/SteamStructs.cs +++ b/Facepunch.Steamworks/Generated/SteamStructs.cs @@ -196,10 +196,10 @@ namespace Steamworks.Data } [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal struct SteamNetworkingConfigValue_t + internal struct NetConfig_t { - internal SteamNetworkingConfigValue Value; // m_eValue ESteamNetworkingConfigValue - internal SteamNetworkingConfigDataType DataType; // m_eDataType ESteamNetworkingConfigDataType + internal NetConfig Value; // m_eValue ESteamNetworkingConfigValue + internal NetConfigType DataType; // m_eDataType ESteamNetworkingConfigDataType internal long Nt64; // m_int64 int64_t internal int Val_int32; // m_val_int32 int32_t internal long Val_int64; // m_val_int64 int64_t diff --git a/Generator/Cleanup.cs b/Generator/Cleanup.cs index 0091f3d..9794731 100644 --- a/Generator/Cleanup.cs +++ b/Generator/Cleanup.cs @@ -34,9 +34,9 @@ public static class Cleanup type = type.Replace( "SteamItemDef_t", "InventoryDefId" ); type = type.Replace( "ChatRoomEnterResponse", "RoomEnter" ); type = type.Replace( "SteamNetworkPingLocation_t", "PingLocation" ); - //type = type.Replace( "SteamNetworkingConfigValue", "NetConfig" ); + type = type.Replace( "SteamNetworkingConfigValue", "NetConfig" ); //type = type.Replace( "SteamNetworkingConfigScope", "NetScope" ); - //type = type.Replace( "SteamNetworkingConfigDataType", "NetConfigType" ); + type = type.Replace( "SteamNetworkingConfigDataType", "NetConfigType" ); type = type.Replace( "HSteamNetConnection", "Connection" ); type = type.Replace( "HSteamListenSocket", "Socket" ); type = type.Replace( "SteamNetworkingIPAddr", "NetAddress" );