Skip to content

Commit 4e36693

Browse files
committed
Adding initial/naive way to ascertain if the merger is run through Vortex
1 parent c8af098 commit 4e36693

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

WitcherScriptMerger/App.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ WccLitePath Where wcc_lite.exe is located
4747
<add key="PlayCompletionSounds" value="true" />
4848
<add key="ReportAfterMerge" value="true" />
4949
<add key="ReportAfterPack" value="true" />
50+
<add key="RanThroughVortex" value="false" />
5051
<add key="MergedModName" value="mod0000_MergedFiles" />
5152
<add key="KDiff3Path" value="Tools\KDiff3\KDiff3.exe" />
5253
<add key="QuickBmsPath" value="Tools\QuickBMS\quickbms.exe" />

WitcherScriptMerger/Program.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ static class Program
1919
/// The main entry point for the application.
2020
/// </summary>
2121
[STAThread]
22-
static void Main()
22+
static void Main(string[] args)
2323
{
2424
Application.EnableVisualStyles();
2525
Application.SetCompatibleTextRenderingDefault(false);
@@ -41,6 +41,18 @@ static void Main()
4141
}
4242
}
4343

44+
// Naive way to tell the program that its been executed through
45+
// Vortex - this will have to be enhanced if we're planning
46+
// on implementing some sort of automatic merging capability.
47+
if (args.Length == 1 && args[0] == "vortex")
48+
{
49+
Settings.Set("RanThroughVortex", true);
50+
}
51+
else
52+
{
53+
Settings.Set("RanThroughVortex", false);
54+
}
55+
4456
MainForm = new MainForm();
4557
Application.Run(MainForm);
4658
}

0 commit comments

Comments
 (0)