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 127915b51aecd2688ceece503f2d4fff17c89914..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,14 +25,16 @@ 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},
-       {"place_center_y", DECO_PLACE_CENTER_Y},
-       {"place_center_z", DECO_PLACE_CENTER_Z},
+       {"place_center_x",  DECO_PLACE_CENTER_X},
+       {"place_center_y",  DECO_PLACE_CENTER_Y},
+       {"place_center_z",  DECO_PLACE_CENTER_Z},
        {"force_placement", DECO_FORCE_PLACEMENT},
-       {"liquid_surface", DECO_LIQUID_SURFACE},
-       {NULL,             0}
+       {"liquid_surface",  DECO_LIQUID_SURFACE},
+       {NULL,              0}
 };
 
 
@@ -82,6 +85,56 @@ Decoration::~Decoration()
 void Decoration::resolveNodeNames()
 {
        getIdsFromNrBacklog(&c_place_on);
+       getIdsFromNrBacklog(&c_spawnby);
+}
+
+
+bool Decoration::canPlaceDecoration(MMVManip *vm, v3s16 p)
+{
+       // Check if the decoration can be placed on this node
+       u32 vi = vm->m_area.index(p);
+       if (!CONTAINS(c_place_on, vm->m_data[vi].getContent()))
+               return false;
+
+       // Don't continue if there are no spawnby constraints
+       if (nspawnby == -1)
+               return true;
+
+       int nneighs = 0;
+       static const v3s16 dirs[16] = {
+               v3s16( 0, 0,  1),
+               v3s16( 0, 0, -1),
+               v3s16( 1, 0,  0),
+               v3s16(-1, 0,  0),
+               v3s16( 1, 0,  1),
+               v3s16(-1, 0,  1),
+               v3s16(-1, 0, -1),
+               v3s16( 1, 0, -1),
+
+               v3s16( 0, 1,  1),
+               v3s16( 0, 1, -1),
+               v3s16( 1, 1,  0),
+               v3s16(-1, 1,  0),
+               v3s16( 1, 1,  1),
+               v3s16(-1, 1,  1),
+               v3s16(-1, 1, -1),
+               v3s16( 1, 1, -1)
+       };
+
+       // Check these 16 neighbouring nodes for enough spawnby nodes
+       for (size_t i = 0; i != ARRLEN(dirs); i++) {
+               u32 index = vm->m_area.index(p + dirs[i]);
+               if (!vm->m_area.contains(index))
+                       continue;
+
+               if (CONTAINS(c_spawnby, vm->m_data[index].getContent()))
+                       nneighs++;
+       }
+
+       if (nneighs < nspawnby)
+               return false;
+
+       return true;
 }
 
 
@@ -236,66 +289,15 @@ void DecoSimple::resolveNodeNames()
 {
        Decoration::resolveNodeNames();
        getIdsFromNrBacklog(&c_decos);
-       getIdsFromNrBacklog(&c_spawnby);
 }
 
 
-bool DecoSimple::canPlaceDecoration(MMVManip *vm, v3s16 p)
+size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
 {
        // Don't bother if there aren't any decorations to place
        if (c_decos.size() == 0)
-               return false;
-
-       u32 vi = vm->m_area.index(p);
-
-       // Check if the decoration can be placed on this node
-       if (!CONTAINS(c_place_on, vm->m_data[vi].getContent()))
-               return false;
-
-       // Don't continue if there are no spawnby constraints
-       if (nspawnby == -1)
-               return true;
-
-       int nneighs = 0;
-       v3s16 dirs[16] = {
-               v3s16( 0, 0,  1),
-               v3s16( 0, 0, -1),
-               v3s16( 1, 0,  0),
-               v3s16(-1, 0,  0),
-               v3s16( 1, 0,  1),
-               v3s16(-1, 0,  1),
-               v3s16(-1, 0, -1),
-               v3s16( 1, 0, -1),
-
-               v3s16( 0, 1,  1),
-               v3s16( 0, 1, -1),
-               v3s16( 1, 1,  0),
-               v3s16(-1, 1,  0),
-               v3s16( 1, 1,  1),
-               v3s16(-1, 1,  1),
-               v3s16(-1, 1, -1),
-               v3s16( 1, 1, -1)
-       };
-
-       // Check a Moore neighborhood if there are enough spawnby nodes
-       for (size_t i = 0; i != ARRLEN(dirs); i++) {
-               u32 index = vm->m_area.index(p + dirs[i]);
-               if (!vm->m_area.contains(index))
-                       continue;
-
-               if (CONTAINS(c_spawnby, vm->m_data[index].getContent()))
-                       nneighs++;
-       }
-
-       if (nneighs < nspawnby)
-               return false;
-
-       return true;
-}
-
+               return 0;
 
-size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
-{
        if (!canPlaceDecoration(vm, p))
                return 0;
 
@@ -316,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;
@@ -345,9 +347,7 @@ size_t DecoSchematic::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
        if (schematic == NULL)
                return 0;
 
-       u32 vi = vm->m_area.index(p);
-       content_t c = vm->m_data[vi].getContent();
-       if (!CONTAINS(c_place_on, c))
+       if (!canPlaceDecoration(vm, p))
                return 0;
 
        if (flags & DECO_PLACE_CENTER_X)