diff --git a/ArcFormats/DxLib/ArcDX.cs b/ArcFormats/DxLib/ArcDX.cs index 79073490..f740ddd6 100644 --- a/ArcFormats/DxLib/ArcDX.cs +++ b/ArcFormats/DxLib/ArcDX.cs @@ -313,8 +313,8 @@ namespace GameRes.Formats.DxLib internal static void Decrypt (byte[] data, int index, int count, long offset, byte[] key) { - if (key.Length !=0) - { + if (key.Length == 0) + return; int key_pos = (int)(offset % key.Length); for (int i = 0; i < count; ++i) { @@ -322,7 +322,6 @@ namespace GameRes.Formats.DxLib if (key.Length == key_pos) key_pos = 0; } - } } public override ResourceScheme Scheme diff --git a/ArcFormats/DxLib/DxKey.cs b/ArcFormats/DxLib/DxKey.cs index 6e7df16f..6fdcccff 100644 --- a/ArcFormats/DxLib/DxKey.cs +++ b/ArcFormats/DxLib/DxKey.cs @@ -26,6 +26,7 @@ using System; using System.Linq; using System.Security.Cryptography; +using System.Text; using System.Xml.Linq; using GameRes.Utility; @@ -183,8 +184,8 @@ namespace GameRes.Formats.DxLib oddString = string.Concat(keyword.Where((c, i) => i % 2 == 0)); evenString = string.Concat(keyword.Where((c, i) => (i+1) % 2 == 0)); UInt32 crc_0, crc_1; - crc_0 = Crc32.Compute(Encodings.ASCII.GetBytes(oddString), 0, oddString.Length); - crc_1 = Crc32.Compute(Encodings.ASCII.GetBytes(evenString), 0, evenString.Length); + crc_0 = Crc32.Compute(Encoding.ASCII.GetBytes(oddString), 0, oddString.Length); + crc_1 = Crc32.Compute(Encoding.ASCII.GetBytes(evenString), 0, evenString.Length); byte[] crc_0_Bytes = BitConverter.GetBytes(crc_0),crc_1_Bytes=BitConverter.GetBytes(crc_1); key[0] = crc_0_Bytes[0]; key[1] = crc_0_Bytes[1]; diff --git a/ArcFormats/Properties/Settings.Designer.cs b/ArcFormats/Properties/Settings.Designer.cs index 192f7036..7844d50b 100644 --- a/ArcFormats/Properties/Settings.Designer.cs +++ b/ArcFormats/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Ten kod został wygenerowany przez narzędzie. -// Wersja wykonawcza:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Zmiany w tym pliku mogą spowodować nieprawidłowe zachowanie i zostaną utracone, jeśli -// kod zostanie ponownie wygenerowany. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/GameRes/ArcView.cs b/GameRes/ArcView.cs index 3ec59a73..4cd3a533 100644 --- a/GameRes/ArcView.cs +++ b/GameRes/ArcView.cs @@ -34,7 +34,6 @@ namespace GameRes public static class Encodings { public static readonly Encoding cp932 = Encoding.GetEncoding(932); - public static readonly Encoding ASCII = Encoding.ASCII; public static Encoding WithFatalFallback (this Encoding enc) {