From 0ddca0d9d5c3d1e81cc31ff0262c121370d1064c Mon Sep 17 00:00:00 2001 From: BevapDin Date: Sat, 13 Jul 2019 17:29:14 +0200 Subject: [PATCH] Change std::unqiue_ptr to pimpl That way it can never be null, and we don't have to use an explicit call to `new`. --- src/cata_tiles.cpp | 2 +- src/cata_tiles.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp index 1d47d43202dcb..f1c01a96cd90e 100644 --- a/src/cata_tiles.cpp +++ b/src/cata_tiles.cpp @@ -174,7 +174,7 @@ formatted_text::formatted_text( const std::string &text, const int color, cata_tiles::cata_tiles( const SDL_Renderer_Ptr &renderer ) : renderer( renderer ), - minimap( new pixel_minimap( renderer ) ) + minimap( renderer ) { assert( renderer ); diff --git a/src/cata_tiles.h b/src/cata_tiles.h index 9cb1175d65483..041ab4960e45b 100644 --- a/src/cata_tiles.h +++ b/src/cata_tiles.h @@ -21,6 +21,7 @@ #include "enums.h" #include "weighted_list.h" #include "point.h" +#include "pimpl.h" class Creature; class player; @@ -573,7 +574,7 @@ class cata_tiles */ bool nv_goggles_activated; - std::unique_ptr minimap; + pimpl minimap; public: std::string memory_map_mode = "color_pixel_sepia";