Map generation limit: Cache as 'const' not 'const static'

diff --git a/src/map.cpp b/src/map.cpp
index d4115887f46b7994465269f105995bff1224ca5d..0659f66aa536ec7cba0835d14a699062940691d8 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2078,7 +2078,7 @@ ServerMapSector *ServerMap::createSector(v2s16 p2d)
                Block minimum nodepos = blockpos * mapblocksize.
                Block maximum nodepos = (blockpos + 1) * mapblocksize - 1.
        */
-       const static u16 map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
+       const u16 map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
                g_settings->getU16("map_generation_limit"));
        if (p2d.X * MAP_BLOCKSIZE < -map_gen_limit
                        || (p2d.X + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit

diff --git a/src/mapblock.h b/src/mapblock.h
index d46b7b8801eaafbecd51d64eef3dfafb9028d26e..f808001094240a49c6d8f90d9f9a00354633b5c7 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -653,7 +653,7 @@ typedef std::vector<MapBlock*> MapBlockVect;
 
 inline bool objectpos_over_limit(v3f p)
 {
-       const static float map_gen_limit_bs = MYMIN(MAX_MAP_GENERATION_LIMIT,
+       const float map_gen_limit_bs = MYMIN(MAX_MAP_GENERATION_LIMIT,
                g_settings->getU16("map_generation_limit")) * BS;
        return (p.X < -map_gen_limit_bs
                || p.X > map_gen_limit_bs
@@ -676,7 +676,7 @@ inline bool objectpos_over_limit(v3f p)
 */
 inline bool blockpos_over_limit(v3s16 p)
 {
-       const static u16 map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
+       const u16 map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT,
                g_settings->getU16("map_generation_limit"));
        return (p.X * MAP_BLOCKSIZE < -map_gen_limit 
                || (p.X + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit