diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs index 35ad8be..1e7dc03 100644 --- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs +++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs @@ -119,9 +119,6 @@ namespace AM2RLauncher Environment.Exit(0); } - - - log.Info("Mutex check passed. Entering main thread."); log.Info("Current Launcher Version: " + VERSION); log.Info("Current Platform-ID is: " + Platform.ID); @@ -161,9 +158,8 @@ namespace AM2RLauncher } // Custom splash texts - Random rng = new Random(); - // Some fanciness so we can have Gtk-only quips, because Gtk visuals are lame. - string splash = Splash.SPLASH_LIST[rng.Next(0, Splash.SPLASH_LIST.Length - (Platform.IsGtk ? 0 : 13))]; + var Splash = new Splash() ; + string splash = Splash.GetSplash(); log.Info("Randomly chosen splash: " + splash); // Load bitmaps diff --git a/AM2RLauncher/AM2RLauncher/MainForm/SPLASH_LIST.cs b/AM2RLauncher/AM2RLauncher/MainForm/Splash.cs similarity index 84% rename from AM2RLauncher/AM2RLauncher/MainForm/SPLASH_LIST.cs rename to AM2RLauncher/AM2RLauncher/MainForm/Splash.cs index ad09d13..0bd652e 100644 --- a/AM2RLauncher/AM2RLauncher/MainForm/SPLASH_LIST.cs +++ b/AM2RLauncher/AM2RLauncher/MainForm/Splash.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Text; +using Eto; +using System; namespace AM2RLauncher { class Splash { - public static readonly string[] SPLASH_LIST = + // Splash strings + readonly string[] splashList = { "The real Ridley is the friends we made along the way.", "Now with 100% more Septoggs!", @@ -45,5 +45,13 @@ namespace AM2RLauncher "Was a mouse really that expensive, i3 users!?", "Imagine using non-free software." }; + + // Get random splash string + public string GetSplash() + { + Random rng = new Random(); + string splashString = splashList[rng.Next(0, splashList.Length - (Platform.IsGtk ? 0 : 13))]; + return splashString; + } } }