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.h | |
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.h')
-rw-r--r-- | src/minimap.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/minimap.h b/src/minimap.h index 58d05d668..04ac27a04 100644 --- a/src/minimap.h +++ b/src/minimap.h @@ -78,21 +78,19 @@ struct MinimapData { MinimapPixel minimap_scan[MINIMAP_MAX_SX * MINIMAP_MAX_SY]; bool map_invalidated; bool minimap_shape_round; - video::IImage *minimap_image; - video::IImage *heightmap_image; - video::IImage *minimap_mask_round; - video::IImage *minimap_mask_square; - video::ITexture *texture; - video::ITexture *heightmap_texture; - video::ITexture *minimap_overlay_round; - video::ITexture *minimap_overlay_square; - video::ITexture *player_marker; - video::ITexture *object_marker_red; + video::IImage *minimap_mask_round = nullptr; + video::IImage *minimap_mask_square = nullptr; + video::ITexture *texture = nullptr; + video::ITexture *heightmap_texture = nullptr; + video::ITexture *minimap_overlay_round = nullptr; + video::ITexture *minimap_overlay_square = nullptr; + video::ITexture *player_marker = nullptr; + video::ITexture *object_marker_red = nullptr; }; struct QueuedMinimapUpdate { v3s16 pos; - MinimapMapblock *data; + MinimapMapblock *data = nullptr; }; class MinimapUpdateThread : public UpdateThread { @@ -105,7 +103,7 @@ public: bool pushBlockUpdate(v3s16 pos, MinimapMapblock *data); bool popBlockUpdate(QueuedMinimapUpdate *update); - MinimapData *data; + MinimapData *data = nullptr; protected: virtual void doUpdate(); |