From e9457b9f6542166876025dc512daa012033d8ec4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 5 Apr 2018 02:15:32 -0400
Subject: [PATCH] liquids: use unique_ptr properly

---
 plugins/liquids.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp
index 5b97f9ea2..f478ddccb 100644
--- a/plugins/liquids.cpp
+++ b/plugins/liquids.cpp
@@ -408,34 +408,32 @@ command_result df_liquids_execute(color_ostream &out)
 command_result df_liquids_execute(color_ostream &out, OperationMode &cur_mode, df::coord cursor)
 {
     // create brush type depending on old parameters
-    Brush *brush;
+    std::unique_ptr<Brush> brush;
 
     switch (cur_mode.brush)
     {
     case B_POINT:
-        brush = new RectangleBrush(1,1,1,0,0,0);
+        brush.reset(new RectangleBrush(1,1,1,0,0,0));
         break;
     case B_RANGE:
-        brush = new RectangleBrush(cur_mode.size.x,cur_mode.size.y,cur_mode.size.z,0,0,0);
+        brush.reset(new RectangleBrush(cur_mode.size.x,cur_mode.size.y,cur_mode.size.z,0,0,0));
         break;
     case B_BLOCK:
-        brush = new BlockBrush();
+        brush.reset(new BlockBrush());
         break;
     case B_COLUMN:
-        brush = new ColumnBrush();
+        brush.reset(new ColumnBrush());
         break;
     case B_FLOOD:
-        brush = new FloodBrush(&Core::getInstance());
+        brush.reset(new FloodBrush(&Core::getInstance()));
         break;
     default:
         // this should never happen!
         out << "Old brushtype is invalid! Resetting to point brush.\n";
         cur_mode.brush = B_POINT;
-        brush = new RectangleBrush(1,1,1,0,0,0);
+        brush.reset(new RectangleBrush(1,1,1,0,0,0));
     }
 
-    std::auto_ptr<Brush> brush_ref(brush);
-
     if (!Maps::IsValid())
     {
         out << "Can't see any DF map loaded." << endl;