World start time: Add setting for this, default unchanged

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index c457c5f33d531b46525dcc81fcb9186fc64c197c..05800a0e77d2b01dd85780ad39acaed136be9d9f 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -979,6 +979,9 @@ time_send_interval (Time send interval) int 5
 #    Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged.
 time_speed (Time speed) int 72
 
+#    Time of day when a new world is started, in millihours (0-23999).
+world_start_time (World start time) int 5250 0 23999
+
 #    Interval of saving important changes in the world, stated in seconds.
 server_map_save_interval (Map save interval) float 5.3
 

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 2a3003f76ee2d2d6dc799d7394e039cedc2410d2..74fe6feddfd96605a48002b4cefd8bfb9380701c 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -336,6 +336,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("csm_flavour_noderange_limit", "8");
        settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
        settings->setDefault("time_speed", "72");
+       settings->setDefault("world_start_time", "5250");
        settings->setDefault("server_unload_unused_data_timeout", "29");
        settings->setDefault("max_objects_per_block", "64");
        settings->setDefault("server_map_save_interval", "5.3");

diff --git a/src/environment.cpp b/src/environment.cpp
index a5c0fc17350639187257045d29b2737fe3a144fe..f9de13baac17e7009c40bb085df212fdce7cb494 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -37,6 +37,9 @@ Environment::Environment(IGameDef *gamedef):
        m_cache_active_block_mgmt_interval = g_settings->getFloat("active_block_mgmt_interval");
        m_cache_abm_interval = g_settings->getFloat("abm_interval");
        m_cache_nodetimer_interval = g_settings->getFloat("nodetimer_interval");
+
+       m_time_of_day = g_settings->getU32("world_start_time");
+       m_time_of_day_f = (float)m_time_of_day / 24000.0f;
 }
 
 u32 Environment::getDayNightRatio()

diff --git a/src/environment.h b/src/environment.h
index bafb3b1faa2706bf9401c8c1cd4453f810d23c71..1a1debcb9dab5824bbe3ea4ed050e1450cf71d5f 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -107,10 +107,10 @@ protected:
        /*
         * Below: values managed by m_time_lock
        */
-       // Time of day in milli-hours (0-23999); determines day and night
-       u32 m_time_of_day = 5250;
-       // Time of day in 0...1; start 5:15am unless overridden by game
-       float m_time_of_day_f = 5250.0f / 24000.0f;
+       // Time of day in milli-hours (0-23999), determines day and night
+       u32 m_time_of_day;
+       // Time of day in 0...1
+       float m_time_of_day_f;
        // Stores the skew created by the float -> u32 conversion
        // to be applied at next conversion, so that there is no real skew.
        float m_time_conversion_skew = 0.0f;