Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

[oweals/minetest.git] / src / mg_decoration.cpp

diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index 92483abc3d13c7c6f049bbe15d4d64d38c9f8bb6..b0566e83072aeefe6737935e74a60acfa7b2f9d7 100644 (file)
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2017 paramat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -24,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #include "log.h"
 #include "util/numeric.h"
+#include <algorithm>
+
 
 FlagDesc flagdesc_deco[] = {
        {"place_center_x",  DECO_PLACE_CENTER_X},
@@ -315,7 +318,7 @@ size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
                                !force_placement)
                        break;
 
-               vm->m_data[vi] = MapNode(c_place);
+               vm->m_data[vi] = MapNode(c_place, 0, deco_param2);
        }
 
        return 1;