Fix documentation of emergequeue_limit settings

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 28ea58ffd95a80b61a56675be1736b2ac21f76e5..e18de3382c566f341e654fa0cdcf8b62a9b6c924 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2159,15 +2159,15 @@ chunksize (Chunk size) int 5
 enable_mapgen_debug_info (Mapgen debug) bool false
 
 #    Maximum number of blocks that can be queued for loading.
-emergequeue_limit_total (Absolute limit of emerge queues) int 512
+emergequeue_limit_total (Absolute limit of queued blocks to emerge) int 512
 
 #    Maximum number of blocks to be queued that are to be loaded from file.
-#    Set to blank for an appropriate amount to be chosen automatically.
-emergequeue_limit_diskonly (Limit of emerge queues on disk) int 64
+#    This limit is enforced per player.
+emergequeue_limit_diskonly (Per-player limit of queued blocks load from disk) int 64
 
 #    Maximum number of blocks to be queued that are to be generated.
-#    Set to blank for an appropriate amount to be chosen automatically.
-emergequeue_limit_generate (Limit of emerge queues to generate) int 64
+#    This limit is enforced per player.
+emergequeue_limit_generate (Per-player limit of queued blocks to generate) int 64
 
 #    Number of emerge threads to use.
 #    Value 0:

diff --git a/minetest.conf.example b/minetest.conf.example
index f04822c474e6b6a0757ecc916ae502059d89ab60..17d24a5661953ec356238352a3952691ac15c56f 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -3251,12 +3251,12 @@
 # emergequeue_limit_total = 512
 
 #    Maximum number of blocks to be queued that are to be loaded from file.
-#    Set to blank for an appropriate amount to be chosen automatically.
+#    This limit is enforced per player.
 #    type: int
 # emergequeue_limit_diskonly = 64
 
 #    Maximum number of blocks to be queued that are to be generated.
-#    Set to blank for an appropriate amount to be chosen automatically.
+#    This limit is enforced per player.
 #    type: int
 # emergequeue_limit_generate = 64
 

diff --git a/src/emerge.cpp b/src/emerge.cpp
index a9fc0a4de84511d145090d1695fb35e421975821..0ac26a68232b35bb81e1e464fe18d03401d6fbbd 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -159,6 +159,7 @@ EmergeManager::EmergeManager(Server *server)
                nthreads = 1;
 
        m_qlimit_total = g_settings->getU16("emergequeue_limit_total");
+       // FIXME: these fallback values are probably not good
        if (!g_settings->getU16NoEx("emergequeue_limit_diskonly", m_qlimit_diskonly))
                m_qlimit_diskonly = nthreads * 5 + 1;
        if (!g_settings->getU16NoEx("emergequeue_limit_generate", m_qlimit_generate))