diff --git a/NovetusLauncher/NovetusCMD/Program.cs b/NovetusLauncher/NovetusCMD/Program.cs index afefde2..33098d1 100644 --- a/NovetusLauncher/NovetusCMD/Program.cs +++ b/NovetusLauncher/NovetusCMD/Program.cs @@ -213,6 +213,7 @@ namespace NovetusCMD { GlobalVars.Version = lines[0]; } + GlobalVars.Branch = lines[0]; GlobalVars.DefaultClient = lines[1]; GlobalVars.DefaultMap = lines[2]; GlobalVars.RegisterClient1 = lines[3]; diff --git a/NovetusLauncher/NovetusFuncs/GlobalVars.cs b/NovetusLauncher/NovetusFuncs/GlobalVars.cs index 210c8c1..d76bed2 100644 --- a/NovetusLauncher/NovetusFuncs/GlobalVars.cs +++ b/NovetusLauncher/NovetusFuncs/GlobalVars.cs @@ -136,7 +136,8 @@ public static class GlobalVars public static string IP = "localhost"; public static string Version = ""; - public static string SharedArgs = ""; + public static string Branch = ""; + public static string SharedArgs = ""; public static readonly string ScriptName = "CSMPFunctions"; public static readonly string ScriptGenName = "CSMPBoot"; public static SimpleHTTPServer WebServer = null; diff --git a/NovetusLauncher/NovetusFuncs/SplashReader.cs b/NovetusLauncher/NovetusFuncs/SplashReader.cs index fe6e9a7..27d8870 100644 --- a/NovetusLauncher/NovetusFuncs/SplashReader.cs +++ b/NovetusLauncher/NovetusFuncs/SplashReader.cs @@ -27,10 +27,15 @@ public static class SplashReader return splash; } } - - string formattedsplash = splash.Replace("%name%", GlobalVars.PlayerName); - - return formattedsplash; + + CryptoRandom random = new CryptoRandom(); + + string formattedsplash = splash + .Replace("%name%", GlobalVars.PlayerName) + .Replace("%nextversion%", (Convert.ToDouble(GlobalVars.Branch) + 0.1).ToString()) + .Replace("%randomtext%", SecurityFuncs.RandomString(random.Next(2,32))); + + return formattedsplash; } private static bool IsTheSameDay(DateTime date1, DateTime date2) diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index 8c4dae7..1f8e63b 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -432,7 +432,8 @@ namespace NovetusLauncher { GlobalVars.Version = lines[0]; } - GlobalVars.DefaultClient = lines[1]; + GlobalVars.Branch = lines[0]; + GlobalVars.DefaultClient = lines[1]; GlobalVars.DefaultMap = lines[2]; GlobalVars.RegisterClient1 = lines[3]; GlobalVars.RegisterClient2 = lines[4]; diff --git a/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs b/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs index b97059f..9460c0e 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/NovetusSDK.cs @@ -57,6 +57,7 @@ namespace NovetusLauncher { GlobalVars.Version = lines[0]; } + GlobalVars.Branch = lines[0]; Text = "Novetus SDK " + GlobalVars.Version; label1.Text = GlobalVars.Version; } diff --git a/NovetusLauncher/NovetusURI/URI/LoaderForm.cs b/NovetusLauncher/NovetusURI/URI/LoaderForm.cs index 8773313..3ad2bdd 100644 --- a/NovetusLauncher/NovetusURI/URI/LoaderForm.cs +++ b/NovetusLauncher/NovetusURI/URI/LoaderForm.cs @@ -83,7 +83,8 @@ namespace NovetusURI { GlobalVars.Version = lines[0]; } - GlobalVars.DefaultClient = lines[1]; + GlobalVars.Branch = lines[0]; + GlobalVars.DefaultClient = lines[1]; GlobalVars.DefaultMap = lines[2]; GlobalVars.RegisterClient1 = lines[3]; GlobalVars.RegisterClient2 = lines[4];