Fix Lint broken by b662a4577d692329b9ca83525e6039f2ddcd1ac1

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

diff --git a/src/mg_decoration.h b/src/mg_decoration.h
index da98fd4820ce4dd6d4eae92e091f9ce9019843e4..986328ec3bc86be4a4ba741823d96bca45920057 100644 (file)
--- a/src/mg_decoration.h
+++ b/src/mg_decoration.h
@@ -68,6 +68,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,6 +83,8 @@ public:
        s16 y_max;
        float fill_ratio;
        NoiseParams np;
+       std::vector<content_t> c_spawnby;
+       s16 nspawnby;
 
        UNORDERED_SET<u8> biomes;
        //std::list<CutoffData> cutoffs;
@@ -90,17 +93,14 @@ public:
 
 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 {