Remove Android makefile ugly make -j hack

[minetest.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index 4ad670bde22d47dfb87065c33adc9426d57ded15..1653199ecbb15d5f59fb83b4c79b7cfab3a79d59 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -44,7 +44,7 @@ class DecorationManager;
 class SchematicManager;
 
 struct BlockMakeData {
-       ManualMapVoxelManipulator *vmanip;
+       MMVManip *vmanip;
        u64 seed;
        v3s16 blockpos_min;
        v3s16 blockpos_max;
@@ -101,19 +101,16 @@ class EmergeManager {
        ~EmergeManager();
 
        void loadMapgenParams();
+       static MapgenSpecificParams *createMapgenParams(const std::string &mgname);
        void initMapgens();
        Mapgen *getCurrentMapgen();
        Mapgen *createMapgen(const std::string &mgname, int mgid,
                MapgenParams *mgparams);
-       MapgenSpecificParams *createMapgenParams(const std::string &mgname);
        static void getMapgenNames(std::list<const char *> &mgnames);
        void startThreads();
        void stopThreads();
        bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
 
-       void loadParamsFromSettings(Settings *settings);
-       void saveParamsToSettings(Settings *settings);
-
        //mapgen helper methods
        Biome *getBiomeAtPoint(v3s16 p);
        int getGroundLevelAtPoint(v2s16 p);