diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp index 9903a38f09..07381b4739 100644 --- a/src/client/mapblock_mesh.cpp +++ b/src/client/mapblock_mesh.cpp @@ -626,7 +626,7 @@ MapBlockMesh::MapBlockMesh(Client *client, MeshMakeData *data): if (data->m_vmanip.getNodeNoEx(p).getContent() != CONTENT_IGNORE) { MinimapMapblock *block = new MinimapMapblock; m_minimap_mapblocks[mesh_grid.getOffsetIndex(ofs)] = block; - block->getMinimapNodes(data, p); + block->getMinimapNodes(&data->m_vmanip, data->m_nodedef, p); } } } diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp index 66fabcb562..ae6244b93b 100644 --- a/src/client/minimap.cpp +++ b/src/client/minimap.cpp @@ -713,9 +713,8 @@ void Minimap::updateActiveMarkers() //// MinimapMapblock //// -void MinimapMapblock::getMinimapNodes(MeshMakeData *meshdata, const v3s16 &pos) +void MinimapMapblock::getMinimapNodes(VoxelManipulator *vmanip, const NodeDefManager *nodedef, const v3s16 &pos) { - VoxelManipulator *vmanip = &meshdata->m_vmanip; for (s16 x = 0; x < MAP_BLOCKSIZE; x++) for (s16 z = 0; z < MAP_BLOCKSIZE; z++) { s16 air_count = 0; @@ -725,7 +724,7 @@ void MinimapMapblock::getMinimapNodes(MeshMakeData *meshdata, const v3s16 &pos) for (s16 y = MAP_BLOCKSIZE -1; y >= 0; y--) { v3s16 p(x, y, z); MapNode n = vmanip->getNodeNoEx(pos + p); - const ContentFeatures &f = meshdata->m_nodedef->get(n); + const ContentFeatures &f = nodedef->get(n); if (!surface_found && f.drawtype != NDT_AIRLIKE) { mmpixel->height = y; mmpixel->n = n; diff --git a/src/client/minimap.h b/src/client/minimap.h index 5d5939c8c2..d0d03f9c61 100644 --- a/src/client/minimap.h +++ b/src/client/minimap.h @@ -67,7 +67,7 @@ struct MinimapPixel { }; struct MinimapMapblock { - void getMinimapNodes(MeshMakeData *data, const v3s16 &pos); + void getMinimapNodes(VoxelManipulator *vmanip, const NodeDefManager *nodedef, const v3s16 &pos); MinimapPixel data[MAP_BLOCKSIZE * MAP_BLOCKSIZE]; };