Use std::queue for HTTPFetchRequest and std::vector for log_output instead of std...

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

diff --git a/src/mg_decoration.h b/src/mg_decoration.h
index 59c3ff5583b22a722816b4803e0b4846c3012be4..ab4a9377b49361999f6dc9d77e8c4cea44f03e7b 100644 (file)
--- a/src/mg_decoration.h
+++ b/src/mg_decoration.h
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct NoiseParams;
 class Mapgen;
-class ManualMapVoxelManipulator;
+class MMVManip;
 class PseudoRandom;
 class Schematic;
 
@@ -81,9 +81,9 @@ public:
        virtual void resolveNodeNames(NodeResolveInfo *nri);
 
        size_t placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
-       size_t placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
+       //size_t placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
 
-       virtual size_t generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p) = 0;
+       virtual size_t generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p) = 0;
        virtual int getHeight() = 0;
 };
 
@@ -97,8 +97,8 @@ public:
 
        virtual void resolveNodeNames(NodeResolveInfo *nri);
 
-       bool canPlaceDecoration(ManualMapVoxelManipulator *vm, v3s16 p);
-       virtual size_t generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p);
+       bool canPlaceDecoration(MMVManip *vm, v3s16 p);
+       virtual size_t generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p);
        virtual int getHeight();
 };
 
@@ -108,7 +108,7 @@ public:
        Schematic *schematic;
        std::string filename;
 
-       virtual size_t generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p);
+       virtual size_t generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p);
        virtual int getHeight();
 };
 
@@ -144,7 +144,7 @@ public:
 
        void clear();
 
-       size_t placeAllDecos(Mapgen *mg, u32 seed, v3s16 nmin, v3s16 nmax);
+       size_t placeAllDecos(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
 };
 
 #endif