Skip to content

Commit 5609a60

Browse files
unknownunknown
unknown
authored and
unknown
committed
Patch 12 and ssl fix
Merge remote-tracking branch 'Master/master'
2 parents 2770d34 + 47d9b29 commit 5609a60

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

dep/openssl/src/ManagedOpenSsl/Core/Native.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1783,7 +1783,7 @@ public static int BIO_set_close(IntPtr bp, int arg)
17831783
public extern static uint ERR_get_error();
17841784

17851785
[DllImport(DLLNAME)]
1786-
public extern static uint ERR_error_string_n(uint e, byte[] buf, int len);
1786+
public extern static void ERR_error_string_n(uint e, byte[] buf, int len);
17871787

17881788
[DllImport(DLLNAME)]
17891789
public extern static IntPtr ERR_lib_error_string(uint e);

src/Mooege/Common/MPQ/Data.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ private MpqFile GetFile(string fileName, bool startSearchingFromBaseMPQ = false)
211211
var i = 0;
212212
foreach (MpqArchive archive in this.FileSystem.Archives)
213213
{
214-
if (i++ < 4) continue;
214+
if (i++ < 5) continue;
215215

216216
file = archive.FindFile(fileName);
217217
if (file != null)

src/Mooege/Common/Versions/VersionInfo.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static class Assembly
3636
/// <summary>
3737
/// Main assemblies version.
3838
/// </summary>
39-
public const string Version = "1.8350.*";
39+
public const string Version = "1.8392.*";
4040
}
4141

4242
/// <summary>
@@ -47,11 +47,11 @@ public static class MooNet
4747
/// <summary>
4848
/// Required client version.
4949
/// </summary>
50-
public const int RequiredClientVersion = 8350;
50+
public const int RequiredClientVersion = 8392;
5151

5252
public static Dictionary<string, int> ClientVersionMaps = new Dictionary<string, int>
5353
{
54-
{"Aurora 9e9ccb8fdf_public", 8350},
54+
{"Aurora 9e9ccb8fdf_public", 8392},
5555
{"Aurora f506438e8d_public", 8101},
5656
{"Aurora fbb3e7d1b4_public", 8059},
5757
{"Aurora 04768e5dce_public", 7931},
@@ -98,7 +98,7 @@ public static class MPQ
9898
/// <summary>
9999
/// Required MPQ patch version.
100100
/// </summary>
101-
public const int RequiredPatchVersion = 8350;
101+
public const int RequiredPatchVersion = 8392;
102102
}
103103

104104
/// <summary>
@@ -111,16 +111,17 @@ public static class Ingame
111111
/// </summary>
112112
public const int ProtocolHash = 0x1A64B41;
113113

114-
// 0x01A64B41 // 8296, 8350
114+
// 0x01A64B41 // 8296, 8350, 8392
115115
// 0xBA957E6B // 8059, 8101
116116
// unchecked((int)0x208CA037) // 7931
117117
// unchecked((int)0x208CA037) // 7841
118118
// unchecked((int)0x9E121BBD) // 7728
119119
// 0x21EEE08D // 7446
120120

121121
//This is the server version sent in VersionsMessage
122-
public const string VersionString = "0.6.1.8350";
122+
public const string VersionString = "0.6.2.8392";
123123

124+
// 0.6.2.8392 // 8392 patch 12
124125
// 0.6.1.8350 // 8350 patch 11
125126
// 0.6.0.8318 // 8296 patch 10
126127
// 0.5.1.8115 // 8101 patch 9

0 commit comments

Comments
 (0)