vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(9122340aa) Fixed inability to enable content packages if some of the files included in the package are already in the game folder (which may happen, for example, if enabling a content package fails)

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-29 21:10:20 +03:00
parent 4d1c3b1ed4
commit d3ef770243
4 changed files with 125 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Map/Md5Hash.cs
+11 -27
View File
@@ -8,44 +8,28 @@ namespace Barotrauma
{
public class Md5Hash
{
private string hash;
private string shortHash;
public string Hash { get; private set; }
public string Hash
{
get
{
return hash;
}
}
public string ShortHash
{
get
{
return shortHash;
}
}
public string ShortHash { get; private set; }
public Md5Hash(string md5Hash)
{
this.hash = md5Hash;
shortHash = GetShortHash(md5Hash);
this.Hash = md5Hash;
ShortHash = GetShortHash(md5Hash);
}
public Md5Hash(byte[] bytes)
{
hash = CalculateHash(bytes);
Hash = CalculateHash(bytes);
shortHash = GetShortHash(hash);
ShortHash = GetShortHash(Hash);
}
public Md5Hash(FileStream fileStream)
{
hash = CalculateHash(fileStream);
Hash = CalculateHash(fileStream);
shortHash = GetShortHash(hash);
ShortHash = GetShortHash(Hash);
}
public Md5Hash(XDocument doc)
@@ -56,14 +40,14 @@ namespace Barotrauma
byte[] inputBytes = Encoding.ASCII.GetBytes(docString);
hash = CalculateHash(inputBytes);
Hash = CalculateHash(inputBytes);
shortHash = GetShortHash(hash);
ShortHash = GetShortHash(Hash);
}
public override string ToString()
{
return hash;
return Hash;
}
private string CalculateHash(FileStream stream)