araxiaonline/WoWDBDefs
3
0
Fork 0
mirror of https://github.com/araxiaonline/WoWDBDefs.git synced 2026-06-13 03:32:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

C#: Always output to same filename as file thats being merged into

Browse Source
This commit is contained in:
Martin Benjamins
2019-02-20 16:26:27 +01:00
parent a3fc5fecaa
commit 626ba40e44
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/C#/DBDefsMerge/Program.cs
View File

@@ -39,7 +39,8 @@ namespace DBDefsMerge
if (firstDirFilesLC.Contains(file.ToLower()))
{
// Both directories have this file. Merge!
var firstFile = reader.Read(Path.Combine(firstDir, firstDirFiles.ElementAt(firstDirFilesLC.IndexOf(file.ToLower()))));
var firstFileName = Path.Combine(firstDir, firstDirFiles.ElementAt(firstDirFilesLC.IndexOf(file.ToLower())));
var firstFile = reader.Read(firstFileName);
var secondFile = reader.Read(Path.Combine(secondDir, file));
var newDefinition = firstFile;
@@ -341,7 +342,7 @@ namespace DBDefsMerge
}
}
newDefinitions.Add(dbName, newDefinition);
newDefinitions.Add(Path.GetFileNameWithoutExtension(firstFileName), newDefinition);
}
else
{