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

paramat · paramat · commit 8c1b4f298e28 · 2017-01-08T21:18:11.000Z
diff --git 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
@@ -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
