Ticket #2116: patch_splashscreen.3.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
+; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch.
+splashscreenversion = 0
 
 ; 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.DisableSplashScreen();
             Engine.PopGuiPage();
             ]]></action>
         </object>

source/gui/scripting/ScriptFunctions.cpp

@@ -526 +526 @@
 
 bool IsSplashScreenEnabled(void* UNUSED(cbdata))
 {
-    bool splashScreenEnable = true;
-    CFG_GET_VAL("splashscreenenable", Bool, splashScreenEnable);
-    return splashScreenEnable;
+    time_t splashScreenVersion = 0;
+    CFileInfo splashFileInfo;
+
+    CFG_GET_VAL("splashscreenversion", Time, splashScreenVersion);
+
+    if(g_VFS->GetFileInfo("gui/splashscreen/splashscreen.txt", &splashFileInfo) == INFO::OK)
+        return (splashScreenVersion != splashFileInfo.MTime());
+    else
+        return true;    
 }
 
-void SetSplashScreenEnabled(void* UNUSED(cbdata), bool enabled)
+void DisableSplashScreen(void* UNUSED(cbdata))
 {
-    CStr val = (enabled ? "true" : "false");
-    g_ConfigDB.CreateValue(CFG_USER, "splashscreenenable")->m_String = val;
+    CFileInfo splashFileInfo;
+    CStr val;
+
+    g_VFS->GetFileInfo("gui/splashscreen/splashscreen.txt", &splashFileInfo);
+    val = CStr::FromInt64(splashFileInfo.MTime());
+    
+    g_ConfigDB.CreateValue(CFG_USER, "splashscreenversion")->m_String = val;
     g_ConfigDB.WriteFile(CFG_USER);
 }
 
@@ -722 +733 @@
 
     // Splash screen functions
     scriptInterface.RegisterFunction<bool, &IsSplashScreenEnabled>("IsSplashScreenEnabled");
-    scriptInterface.RegisterFunction<void, bool, &SetSplashScreenEnabled>("SetSplashScreenEnabled");
+    scriptInterface.RegisterFunction<void, &DisableSplashScreen>("DisableSplashScreen");
 
     // Development/debugging functions
     scriptInterface.RegisterFunction<void, float, &SetSimRate>("SetSimRate");

source/ps/Parser.cpp

@@ -224 +224 @@
 FUNC_IMPL_CAST_GETDOUBLE(GetUnsignedShort,  unsigned short)
 FUNC_IMPL_CAST_GETDOUBLE(GetUnsignedInt,    unsigned int)
 FUNC_IMPL_CAST_GETDOUBLE(GetUnsignedLong,   unsigned long)
+FUNC_IMPL_CAST_GETDOUBLE(GetTime,           time_t)
 
 // CParserTaskTypeNode
 // ---------------------------------------------------------------------| Class

source/ps/Parser.h

@@ -106 +106 @@
     bool GetUnsignedInt(unsigned int &ret);
     bool GetUnsignedLong(unsigned long &ret);
     bool GetFloat(float &ret);
+    bool GetTime(time_t &time);
     bool GetDouble(double &ret);
 
     // Memory regardless if it's an int, real, string or whatever