epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3234 from Mailaender/ts-mix-filehashes

Browse Source 
Added support for Tiberian Sun MIX filename hashes
This commit is contained in:
Paul Chote
2013-05-15 00:02:29 -07:00
parent 3500f4b3e3 7fb85e7abb
commit 63c71bf3f5
6 changed files with 162 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.FileFormats/Filesystem/MixFile.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -151,7 +151,11 @@ namespace OpenRA.FileFormats
public Stream GetContent(string filename)
{
return GetContent(PackageEntry.HashFilename(filename));
var content = GetContent(PackageEntry.HashFilename(filename)); // RA1 and TD
if (content != null)
return content;
else
return GetContent(PackageEntry.CrcHashFilename(filename)); // TS
}
public IEnumerable<uint> AllFileHashes()
@@ -161,7 +165,7 @@ namespace OpenRA.FileFormats
public bool Exists(string filename)
{
return index.ContainsKey(PackageEntry.HashFilename(filename));
return (index.ContainsKey(PackageEntry.HashFilename(filename)) || index.ContainsKey(PackageEntry.CrcHashFilename(filename)));
}
@@ -187,7 +191,7 @@ namespace OpenRA.FileFormats
{
var length = (uint)kv.Value.Length;
var hash = PackageEntry.HashFilename(Path.GetFileName(kv.Key));
items.Add(new PackageEntry(hash, dataSize, length));
items.Add(new PackageEntry(hash, dataSize, length)); // TODO: Tiberian Sun uses CRC hashes
dataSize += length;
}