From bf61785f96b005abacbca6e7937956002a894779 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 1 Apr 2016 17:21:50 +0100 Subject: [PATCH 1/2] Remove BinaryReader from XccGlobalDatabase. --- OpenRA.Game/FileFormats/XccGlobalDatabase.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/OpenRA.Game/FileFormats/XccGlobalDatabase.cs b/OpenRA.Game/FileFormats/XccGlobalDatabase.cs index abec7e0ceb..1b29c4678d 100644 --- a/OpenRA.Game/FileFormats/XccGlobalDatabase.cs +++ b/OpenRA.Game/FileFormats/XccGlobalDatabase.cs @@ -20,22 +20,21 @@ namespace OpenRA.FileFormats public XccGlobalDatabase(Stream s) { var entries = new List(); - var reader = new BinaryReader(s); - while (reader.PeekChar() > -1) + while (s.Peek() > -1) { - var count = reader.ReadInt32(); + var count = s.ReadInt32(); for (var i = 0; i < count; i++) { var chars = new List(); - char c; + byte c; // Read filename - while ((c = reader.ReadChar()) != 0) - chars.Add(c); + while ((c = s.ReadUInt8()) != 0) + chars.Add((char)c); entries.Add(new string(chars.ToArray())); // Skip comment - while ((c = reader.ReadChar()) != 0) { } + while ((c = s.ReadUInt8()) != 0) { } } } From d6818be229c3d8508f59869be18249a5015d764c Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 1 Apr 2016 17:22:16 +0100 Subject: [PATCH 2/2] Add nod_win1.aud and nod_map1.aud to mix database. --- global mix database.dat | Bin 408131 -> 408175 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/global mix database.dat b/global mix database.dat index 6c7259f7688391f8f0c039fd3bc0cd026af2e57f..857c2575e415e11b7de7b642888511baf720f0ed 100644 GIT binary patch delta 67 zcmX^7MdJMz2}X&HjDkHPdHE^v<(YYgdWoee3_y+okTY4ZM}q|<(X7_fuGYf{#7scU O48$zk)p}TE*8u=lVHec^ delta 41 scmaF=MdI)m2}ZGvjDkIr)qB*NQ+wJ|dl-S335c12m}Prv4=dL?0BnvBVE_OC