diff --git a/Barotrauma/BarotraumaClient/libfreetype.6.dylib b/Barotrauma/BarotraumaClient/libfreetype.6.dylib deleted file mode 100755 index 2a8285484..000000000 Binary files a/Barotrauma/BarotraumaClient/libfreetype.6.dylib and /dev/null differ diff --git a/Libraries/Facepunch.Steamworks/Client/ServerList.Server.cs b/Libraries/Facepunch.Steamworks/Client/ServerList.Server.cs index f5f74493a..40dfdc653 100644 --- a/Libraries/Facepunch.Steamworks/Client/ServerList.Server.cs +++ b/Libraries/Facepunch.Steamworks/Client/ServerList.Server.cs @@ -55,7 +55,7 @@ namespace Facepunch.Steamworks Name = Encoding.UTF8.GetString(item.ServerName), Ping = item.Ping, GameDir = item.GameDir, - Map = item.Map, + Map = Encoding.UTF8.GetString(item.Map), Description = item.GameDescription, AppId = item.AppID, Players = item.Players, diff --git a/Libraries/Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs b/Libraries/Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs index e8689420d..92b527357 100644 --- a/Libraries/Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs +++ b/Libraries/Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs @@ -5658,8 +5658,8 @@ namespace SteamNative internal bool DoNotRefresh; // m_bDoNotRefresh _Bool [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)] internal string GameDir; // m_szGameDir char [32] - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)] - internal string Map; // m_szMap char [32] + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)] + internal byte[] Map; // m_szMap char [32] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)] internal string GameDescription; // m_szGameDescription char [64] internal uint AppID; // m_nAppID uint32 @@ -5707,8 +5707,8 @@ namespace SteamNative internal bool DoNotRefresh; // m_bDoNotRefresh _Bool [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)] internal string GameDir; // m_szGameDir char [32] - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)] - internal string Map; // m_szMap char [32] + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)] + internal byte[] Map; // m_szMap char [32] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)] internal string GameDescription; // m_szGameDescription char [64] internal uint AppID; // m_nAppID uint32 @@ -5739,7 +5739,7 @@ namespace SteamNative HadSuccessfulResponse = d.HadSuccessfulResponse, DoNotRefresh = d.DoNotRefresh, GameDir = d.GameDir, - Map = d.Map, + Map = (byte[])d.Map.Clone(), GameDescription = d.GameDescription, AppID = d.AppID, Players = d.Players,