luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 00:25:19 +02:00
Code Activity

Clean-up Minimap code

Browse Source 
- Fixed race conditions
- Fixed null dereference
- Fixed out-of-bounds array access
- MinimapMapblock is now allocated and added to update queue only when enabled
- Removed dependency on LocalPlayer
- Fixed code style
- Simplified expressions and program logic
- Cleaned minimap object interfaces
This commit is contained in:
kwolekr
2015-07-08 00:45:24 -04:00
parent ba15c98e4d
commit e234d8b378
5 changed files with 450 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/client.cpp
View File

@@ -525,18 +525,23 @@ void Client::step(float dtime)
while (!m_mesh_update_thread.m_queue_out.empty())
{
num_processed_meshes++;
MinimapMapblock *minimap_mapblock = NULL;
bool do_mapper_update = true;
MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
MinimapMapblock *minimap_mapblock = NULL;
if (block) {
// Delete the old mesh
if (block->mesh != NULL) {
if (block->mesh != NULL) {
delete block->mesh;
block->mesh = NULL;
}
if (r.mesh)
if (r.mesh) {
minimap_mapblock = r.mesh->getMinimapMapblock();
do_mapper_update = (minimap_mapblock != NULL);
}
if (r.mesh && r.mesh->getMesh()->getMeshBufferCount() == 0) {
delete r.mesh;
@@ -550,7 +555,8 @@ void Client::step(float dtime)
minimap_mapblock = NULL;
}
m_mapper->addBlock(r.p, minimap_mapblock);
if (do_mapper_update)
m_mapper->addBlock(r.p, minimap_mapblock);
if (r.ack_block_to_server) {
/*