X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fclient.cpp;h=30280369f81f539c56ae5a56f5b858da0d093819;hb=8852333eb3042580592ade478e5def20f8ed5d4c;hp=601561f7d4b57a04ce18058ee3bc84b3012ef4dc;hpb=1cc40c0a7c260f0562572bc99f39a666a12f1b09;p=oweals%2Fminetest.git diff --git a/src/client.cpp b/src/client.cpp index 601561f7d..30280369f 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2196,8 +2196,8 @@ void Client::sendReady() writeU8(os,VERSION_PATCH_ORIG); writeU8(os,0); - writeU16(os,strlen(CMAKE_VERSION_GITHASH)); - os.write(CMAKE_VERSION_GITHASH,strlen(CMAKE_VERSION_GITHASH)); + writeU16(os,strlen(minetest_version_hash)); + os.write(minetest_version_hash,strlen(minetest_version_hash)); // Make data buffer std::string s = os.str(); @@ -2475,6 +2475,15 @@ int Client::getCrackLevel() return m_crack_level; } +void Client::setHighlighted(v3s16 pos, bool show_hud) +{ + m_show_hud = show_hud; + v3s16 old_highlighted_pos = m_highlighted_pos; + m_highlighted_pos = pos; + addUpdateMeshTaskForNode(old_highlighted_pos, false, true); + addUpdateMeshTaskForNode(m_highlighted_pos, false, true); +} + void Client::setCrack(int level, v3s16 pos) { int old_crack_level = m_crack_level; @@ -2547,22 +2556,23 @@ void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent) MapBlock *b = m_env.getMap().getBlockNoCreateNoEx(p); if(b == NULL) return; - + /* Create a task to update the mesh of the block */ - + MeshMakeData *data = new MeshMakeData(this); - + { //TimeTaker timer("data fill"); // Release: ~0ms // Debug: 1-6ms, avg=2ms data->fill(b); data->setCrack(m_crack_level, m_crack_pos); + data->setHighlighted(m_highlighted_pos, m_show_hud); data->setSmoothLighting(g_settings->getBool("smooth_lighting")); } - + // Add task to queue m_mesh_update_thread.m_queue_in.addBlock(p, data, ack_to_server, urgent); }