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

When minimap is disabled in configuration, really disable it (#5771)

Browse Source 
* When minimap is disabled in configuration, really disable it
This commit is contained in:
Loïc Blot
2017-05-19 07:25:27 +02:00
committed by GitHub
parent 1c6d2f596d
commit e25a38e3fb
7 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client.cpp
View File

@@ -93,6 +93,7 @@ Client::Client(
m_address_name(address_name),
m_device(device),
m_camera(NULL),
m_minimap(NULL),
m_minimap_disabled_by_server(false),
m_server_ser_ver(SER_FMT_VER_INVALID),
m_proto_ver(0),
@@ -127,7 +128,9 @@ Client::Client(
// Add local player
m_env.setLocalPlayer(new LocalPlayer(this, playername));
m_minimap = new Minimap(device, this);
if (g_settings->getBool("enable_minimap")) {
m_minimap = new Minimap(device, this);
}
m_cache_save_interval = g_settings->getU16("server_map_save_interval");
m_modding_enabled = g_settings->getBool("enable_client_modding");
@@ -502,7 +505,7 @@ void Client::step(float dtime)
delete r.mesh;
}
if (do_mapper_update)
if (m_minimap && do_mapper_update)
m_minimap->addBlock(r.p, minimap_mapblock);
if (r.ack_block_to_server) {