fix

proller · Aug 10, 2024 · 6d83408 · 6d83408
1 parent c2c077e
commit 6d83408
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -19,9 +19,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_STANDARD 20)
 
 set(HAVE_SHARED_MUTEX 1)
-
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
 set(HAVE_THREAD_LOCAL 1)
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)

diff --git a/src/client/clientmap.h b/src/client/clientmap.h
@@ -242,7 +242,7 @@ class ClientMap : public Map, public scene::ISceneNode
 
 // fm:
 	v3pos_t m_camera_position_node;
-    using drawlist_map = std::map<v3pos_t, MapBlockP, MapBlockComparer>;
+    using drawlist_map = std::map<v3bpos_t, MapBlockP, MapBlockComparer>;
 	drawlist_map m_drawlist_0, m_drawlist_1;
 	std::atomic<drawlist_map *> m_drawlist {&m_drawlist_0};
 	std::atomic_bool m_drawlist_current = 0;

diff --git a/src/fm_map.cpp b/src/fm_map.cpp
@@ -427,7 +427,7 @@ u32 Map::timerUpdate(float uptime, float unload_timeout, s32 max_loaded_blocks,
 			}
 			*/
 
-			if (!block->isGenerated()) {
+			if (!block->isGenerated() && !block->getLodMesh(0, true)) {
 				blocks_delete.emplace_back(block);
 				continue;
 			}

diff --git a/src/server.cpp b/src/server.cpp
@@ -1224,8 +1224,8 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 				for (const v3s16 &modified_block : event->modified_blocks) {
 					m_clients.markBlockposAsNotSent(modified_block);
 				}
-*/				
 				SetBlocksNotSent(); //fmtodo
+*/				
 				break;
 			default:
 				prof.add("unknown", 1);
@@ -1247,10 +1247,12 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 				}
 */
 				// Set blocks not sent
+#if 0
 				for (const u16 far_player : far_players) {
 					if (RemoteClient *client = getClient(far_player))
 						client->SetBlocksNotSent(/*modified_blocks2*/);
 				}
+#endif
 			}
 
 			//delete event;

diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
@@ -1746,7 +1746,7 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 
 		int i = 0;
 		// determine the time budget for ABMs
-		u32 n = 0, calls = 0; // end_ms = porting::getTimeMs() + max_cycle_ms; 
+		u32 calls = 0; // end_ms = porting::getTimeMs() + max_cycle_ms; 
 		u32 max_time_ms = m_cache_abm_interval * 1000 * m_cache_abm_time_budget;
 		for (const v3s16 &p : output) {
 /*