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

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

diff --git a/src/mg_decoration.h b/src/mg_decoration.h
index ba3e9d3b258d8abf2cc880c5f5119cf5be8a0c16..950800ec8e458474bf02f685107ab77e6ad57fdc 100644 (file)
--- a/src/mg_decoration.h
+++ b/src/mg_decoration.h
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 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
@@ -20,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MG_DECORATION_HEADER
 #define MG_DECORATION_HEADER
 
-#include <set>
+#include "util/cpp11_container.h"
 #include "objdef.h"
 #include "noise.h"
 #include "nodedef.h"
@@ -68,6 +69,7 @@ public:
 
        virtual void resolveNodeNames();
 
+       bool canPlaceDecoration(MMVManip *vm, v3s16 p);
        size_t placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
        //size_t placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
 
@@ -82,25 +84,24 @@ public:
        s16 y_max;
        float fill_ratio;
        NoiseParams np;
+       std::vector<content_t> c_spawnby;
+       s16 nspawnby;
 
-       std::set<u8> biomes;
+       UNORDERED_SET<u8> biomes;
        //std::list<CutoffData> cutoffs;
        //Mutex cutoff_mutex;
 };
 
 class DecoSimple : public Decoration {
 public:
+       virtual void resolveNodeNames();
        virtual size_t generate(MMVManip *vm, PcgRandom *pr, v3s16 p);
-       bool canPlaceDecoration(MMVManip *vm, v3s16 p);
        virtual int getHeight();
 
-       virtual void resolveNodeNames();
-
        std::vector<content_t> c_decos;
-       std::vector<content_t> c_spawnby;
        s16 deco_height;
        s16 deco_height_max;
-       s16 nspawnby;
+       u8 deco_param2;
 };
 
 class DecoSchematic : public Decoration {