diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-18 19:55:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 19:55:15 +0200 |
| commit | 4faaadc8d50d6ab7a19d22bd5a760c4b8321a51f (patch) | |
| tree | 57ce8401a5f6538024c1f19d37d576fba21e147b /src/minimap.cpp | |
| parent | 8f7785771b9e02b1a1daf7a252550d78ea93053d (diff) | |
| download | minetest-4faaadc8d50d6ab7a19d22bd5a760c4b8321a51f.tar.gz minetest-4faaadc8d50d6ab7a19d22bd5a760c4b8321a51f.tar.bz2 minetest-4faaadc8d50d6ab7a19d22bd5a760c4b8321a51f.zip | |
Cpp11 patchset 11: continue working on constructor style migration (#6004)
Diffstat (limited to 'src/minimap.cpp')
| -rw-r--r-- | src/minimap.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/minimap.cpp b/src/minimap.cpp index 500f49828..9b17cbc6e 100644 --- a/src/minimap.cpp +++ b/src/minimap.cpp @@ -204,8 +204,6 @@ Minimap::Minimap(IrrlichtDevice *device, Client *client) data->mode = MINIMAP_MODE_OFF; data->is_radar = false; data->map_invalidated = true; - data->heightmap_image = NULL; - data->minimap_image = NULL; data->texture = NULL; data->heightmap_texture = NULL; data->minimap_shape_round = g_settings->getBool("minimap_shape_round"); @@ -275,14 +273,14 @@ void Minimap::toggleMinimapShape() void Minimap::setMinimapShape(MinimapShape shape) { MutexAutoLock lock(m_mutex); - + if (shape == MINIMAP_SHAPE_SQUARE) data->minimap_shape_round = false; else if (shape == MINIMAP_SHAPE_ROUND) data->minimap_shape_round = true; - + g_settings->setBool("minimap_shape_round", data->minimap_shape_round); - m_minimap_update_thread->deferUpdate(); + m_minimap_update_thread->deferUpdate(); } MinimapShape Minimap::getMinimapShape() |