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

Merge pull request #3129 from Mailaender/mixfile-duplicates

Browse Source 
Added .mix filename to Exception if duplicate values are found
This commit is contained in:
Chris Forbes
2013-04-20 16:53:38 -07:00
parent 40f73a9289 6125f4f9d3
commit ecae967386
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,10 +56,10 @@ namespace OpenRA.FileFormats
if (isRmix)
{
isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted);
if( isEncrypted )
if (isEncrypted)
{
index = ParseRaHeader(s, out dataStart).ToDictionaryWithConflictLog(x => x.Hash,
"MixFile.RaHeader", null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
"MixFile.RaHeader of {0}".F(filename), null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
);
return;
}
@@ -69,7 +69,7 @@ namespace OpenRA.FileFormats
isEncrypted = false;
index = ParseTdHeader(s, out dataStart).ToDictionaryWithConflictLog(x => x.Hash,
"MixFile.TdHeader", null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
"MixFile.TdHeader of {0}".F(filename), null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
);
}