fix

proller · Dec 31, 2024 · 9f14a7c · 9f14a7c
1 parent 8cb4756
commit 9f14a7c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/games/default b/games/default
diff --git a/src/client/camera.cpp b/src/client/camera.cpp
@@ -637,9 +637,9 @@ void Camera::updateViewingRange()
 
 	m_cameranode->setNearValue(0.1f * BS);
 
-	m_draw_control.wanted_range = std::fmin(adjustDist(viewing_range, getFovMax()), FARMESH_LIMIT * 2);
+	m_draw_control.wanted_range = std::fmin(adjustDist(viewing_range, getFovMax()), FARMESH_LIMIT * 4);
 	if (m_draw_control.range_all) {
-		m_cameranode->setFarValue(FARMESH_LIMIT * 2 * BS);
+		m_cameranode->setFarValue(FARMESH_LIMIT * 4 * BS);
 		return;
 	}
 

diff --git a/src/client/fm_farmesh.cpp b/src/client/fm_farmesh.cpp
@@ -278,6 +278,10 @@ int FarMesh::go_container()
 			[this, &cbpos](const v3bpos_t &bpos, const bpos_t &size) -> bool {
 				const block_step_t step = log(size) / log(2);
 
+				if (step >= FARMESH_STEP_MAX) {
+					return false;
+				}
+
 				// TODO: use block center
 				const auto bdist = radius_box(cbpos, bpos);
 				if ((bdist << MAP_BLOCKP) > farmesh_all_changed) {

diff --git a/src/client/renderingengine.h b/src/client/renderingengine.h
@@ -44,7 +44,7 @@ class Minimap;
 class RenderingCore;
 
 // Instead of a mechanism to disable fog we just set it to be really far away
-#define FOG_RANGE_ALL (FARMESH_LIMIT*3 * BS)
+#define FOG_RANGE_ALL (FARMESH_LIMIT*4 * BS)
 
 class RenderingEngine
 {

diff --git a/util/autotest/auto.pl b/util/autotest/auto.pl
@@ -157,6 +157,7 @@ ()
         cmake_nothreads   => '-DENABLE_THREADS=0 -DHAVE_THREAD_LOCAL=0 -DHAVE_FUTURE=0',
         cmake_nothreads_a => '-DENABLE_THREADS=0 -DHAVE_THREAD_LOCAL=1 -DHAVE_FUTURE=0',
         cmake_opts        => [qw(CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_C_COMPILER_LAUNCHER CMAKE_CXX_COMPILER_LAUNCHER)],
+        cmake_san_debug   => 1,
         config            => $script_path . 'auto.json',
         date              => $g->{date},
         env               => 'OPENSSL_armcap=0',
@@ -417,10 +418,10 @@ ()
         return $r if $r;
         my %D;
         #$D{CMAKE_RUNTIME_OUTPUT_DIRECTORY} = "`pwd`";
-    	local $config->{cmake_debug} = 1, $D{SANITIZE_THREAD}  = 1, if $config->{cmake_tsan};
-	    local $config->{cmake_debug} = 1, $D{SANITIZE_ADDRESS} = 1, if $config->{cmake_asan};
-	    local $config->{cmake_debug} = 1, $D{SANITIZE_MEMORY}  = 1, if $config->{cmake_msan};
-	    local $config->{cmake_debug} = 1, local $config->{keep_luajit} = 1, $D{SANITIZE_UNDEFINED} = 1,
+    	local $config->{cmake_debug} = $config->{cmake_san_debug}, $D{SANITIZE_THREAD}  = 1, if $config->{cmake_tsan};
+	    local $config->{cmake_debug} = $config->{cmake_san_debug}, $D{SANITIZE_ADDRESS} = 1, if $config->{cmake_asan};
+	    local $config->{cmake_debug} = $config->{cmake_san_debug}, $D{SANITIZE_MEMORY}  = 1, if $config->{cmake_msan};
+	    local $config->{cmake_debug} = $config->{cmake_san_debug}, local $config->{keep_luajit} = 1, $D{SANITIZE_UNDEFINED} = 1,
           if $config->{cmake_usan};
 
         $D{ENABLE_LUAJIT}     = 0                                if $config->{cmake_debug} and !$config->{keep_luajit};