BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

World start time: Add setting for this, default unchanged

Browse Source
This commit is contained in:
paramat 2017-09-02 03:18:42 +01:00 committed by paramat
parent ad9786c44b
commit a383eb0eb9
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/settingtypes.txt
View File

@ -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. # Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged.
time_speed (Time speed) int 72 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. # Interval of saving important changes in the world, stated in seconds.
server_map_save_interval (Map save interval) float 5.3 server_map_save_interval (Map save interval) float 5.3

1
src/defaultsettings.cpp
View File

@ -336,6 +336,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("csm_flavour_noderange_limit", "8"); settings->setDefault("csm_flavour_noderange_limit", "8");
settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096"); settings->setDefault("max_clearobjects_extra_loaded_blocks", "4096");
settings->setDefault("time_speed", "72"); settings->setDefault("time_speed", "72");
settings->setDefault("world_start_time", "5250");
settings->setDefault("server_unload_unused_data_timeout", "29"); settings->setDefault("server_unload_unused_data_timeout", "29");
settings->setDefault("max_objects_per_block", "64"); settings->setDefault("max_objects_per_block", "64");
settings->setDefault("server_map_save_interval", "5.3"); settings->setDefault("server_map_save_interval", "5.3");

3
src/environment.cpp
View File

@ -37,6 +37,9 @@ Environment::Environment(IGameDef *gamedef):
m_cache_active_block_mgmt_interval = g_settings->getFloat("active_block_mgmt_interval"); m_cache_active_block_mgmt_interval = g_settings->getFloat("active_block_mgmt_interval");
m_cache_abm_interval = g_settings->getFloat("abm_interval"); m_cache_abm_interval = g_settings->getFloat("abm_interval");
m_cache_nodetimer_interval = g_settings->getFloat("nodetimer_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() u32 Environment::getDayNightRatio()

8
src/environment.h
View File

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