Ticket #2116: patch_splashscreen.diff

binaries/data/config/default.cfg

@@ -20 +20 @@
 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false
 
-; Enable/disable the splashscreen
-splashscreenenable = true
+; Choose the splashscreen. (0 to disable it.)
+splashscreen = 1
 
 ; Pause the game on window focus loss (Only applicable to single player mode)
 pauseonfocusloss = true

binaries/data/mods/public/gui/splashscreen/splashscreen.xml

@@ -23 +23 @@
         <object name="btnOK" type="button" style="StoneButton" tooltip_style="snToolTip" size="24 100%-52 188 100%-24">
             OK
             <action on="Press"><![CDATA[
-            Engine.SetSplashScreenEnabled(!getGUIObjectByName("displaySplashScreen").checked);
+            if(getGUIObjectByName("displaySplashScreen").checked)
+                Engine.SetSplashScreen(0);
             Engine.PopGuiPage();
             ]]></action>
         </object>

source/gui/scripting/ScriptFunctions.cpp

@@ -525 +525 @@
 
 bool IsSplashScreenEnabled(void* UNUSED(cbdata))
 {
-    bool splashScreenEnable = true;
-    CFG_GET_VAL("splashscreenenable", Bool, splashScreenEnable);
-    return splashScreenEnable;
+    unsigned int splashScreen = 0;
+    CFG_GET_VAL("splashscreen", UnsignedInt, splashScreen);
+    
+    return (splashScreen != 0);
 }
 
-void SetSplashScreenEnabled(void* UNUSED(cbdata), bool enabled)
+void SetSplashScreen(void* UNUSED(cbdata), unsigned int id)
 {
-    CStr val = (enabled ? "true" : "false");
-    g_ConfigDB.CreateValue(CFG_USER, "splashscreenenable")->m_String = val;
+    CStr val = CStr::FromUInt(id);
+    g_ConfigDB.CreateValue(CFG_USER, "splashscreen")->m_String = val;
     g_ConfigDB.WriteFile(CFG_USER);
 }
 
@@ -719 +720 @@
 
     // Splash screen functions
     scriptInterface.RegisterFunction<bool, &IsSplashScreenEnabled>("IsSplashScreenEnabled");
-    scriptInterface.RegisterFunction<void, bool, &SetSplashScreenEnabled>("SetSplashScreenEnabled");
+    scriptInterface.RegisterFunction<void, unsigned int, &SetSplashScreen>("SetSplashScreen");
 
     // Development/debugging functions
     scriptInterface.RegisterFunction<void, float, &SetSimRate>("SetSimRate");