diff options
| author | paramat <mat.gregory@virginmedia.com> | 2016-10-19 01:37:12 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2016-10-20 03:40:47 +0100 |
| commit | 63a3bb229a9ff288ab01e3e80c8477da5e84ee1e (patch) | |
| tree | 9f39f171b60c435c0092b29c2c325f702a11e6c0 | |
| parent | c7d569b8636d8046393715e46fca40e58138183f (diff) | |
| download | minetest-63a3bb229a9ff288ab01e3e80c8477da5e84ee1e.tar.gz minetest-63a3bb229a9ff288ab01e3e80c8477da5e84ee1e.tar.bz2 minetest-63a3bb229a9ff288ab01e3e80c8477da5e84ee1e.zip | |
Changes to static object storage limit and error message
Move static object storage force-delete message from errorstream to
warningstream.
Increase 'max objects per block' setting to 64.
Add missing spaces in warning code.
| -rw-r--r-- | builtin/settingtypes.txt | 2 | ||||
| -rw-r--r-- | minetest.conf.example | 2 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 2 | ||||
| -rw-r--r-- | src/environment.cpp | 14 |
4 files changed, 10 insertions, 10 deletions
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 9b5f386e0..492d7c79d 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -817,7 +817,7 @@ max_clearobjects_extra_loaded_blocks (Max. clearobjects extra blocks) int 4096 server_unload_unused_data_timeout (Unload unused server data) int 29 # Maximum number of statically stored objects in a block. -max_objects_per_block (Maximum objects per block) int 49 +max_objects_per_block (Maximum objects per block) int 64 # See http://www.sqlite.org/pragma.html#pragma_synchronous sqlite_synchronous (Synchronous SQLite) enum 2 0,1,2 diff --git a/minetest.conf.example b/minetest.conf.example index e24d3a384..b7d705bac 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1008,7 +1008,7 @@ # Maximum number of statically stored objects in a block. # type: int -# max_objects_per_block = 49 +# max_objects_per_block = 64 # See http://www.sqlite.org/pragma.html#pragma_synchronous # type: enum values: 0, 1, 2 diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 522aa8481..a64840a8f 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -283,7 +283,7 @@ void set_default_settings(Settings *settings) settings->setDefault("time_send_interval", "5"); settings->setDefault("time_speed", "72"); settings->setDefault("server_unload_unused_data_timeout", "29"); - settings->setDefault("max_objects_per_block", "49"); + settings->setDefault("max_objects_per_block", "64"); settings->setDefault("server_map_save_interval", "5.3"); settings->setDefault("chat_message_max_size", "500"); settings->setDefault("chat_message_limit_per_10sec", "8.0"); diff --git a/src/environment.cpp b/src/environment.cpp index ceaf40d89..ecda1b6a4 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -2175,13 +2175,13 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) if(block) { - if(block->m_static_objects.m_stored.size() >= g_settings->getU16("max_objects_per_block")){ - errorstream<<"ServerEnv: Trying to store id="<<obj->getId() - <<" statically but block "<<PP(blockpos) - <<" already contains " - <<block->m_static_objects.m_stored.size() - <<" objects." - <<" Forcing delete."<<std::endl; + if (block->m_static_objects.m_stored.size() >= g_settings->getU16("max_objects_per_block")) { + warningstream << "ServerEnv: Trying to store id = " << obj->getId() + << " statically but block " << PP(blockpos) + << " already contains " + << block->m_static_objects.m_stored.size() + << " objects." + << " Forcing delete." << std::endl; force_delete = true; } else { // If static counterpart already exists in target block, |