Add one more curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);

[dragonfireclient.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index 4f1ab4ebd1169516327296072a5f21ceb2495d4c..911e87537cc3ac5d7bd3071487216762c73122c8 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 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
@@ -36,6 +36,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MGV6_BIOME_BLEND 0x10
 #define MG_FLAT          0x20
 
+extern FlagDesc flagdesc_mapgen[];
+
 class BiomeDefManager;
 class Biome;
 class EmergeManager;
@@ -43,20 +45,7 @@ class MapBlock;
 class ManualMapVoxelManipulator;
 class VoxelManipulator;
 class INodeDefManager;
-
-struct BlockMakeData {
-       bool no_op;
-       ManualMapVoxelManipulator *vmanip;
-       u64 seed;
-       v3s16 blockpos_min;
-       v3s16 blockpos_max;
-       v3s16 blockpos_requested;
-       UniqueQueue<v3s16> transforming_liquid;
-       INodeDefManager *nodedef;
-
-       BlockMakeData();
-       ~BlockMakeData();
-};
+class BlockMakeData;
 
 struct MapgenParams {
        std::string mg_name;
@@ -99,39 +88,5 @@ struct MapgenFactory {
        virtual MapgenParams *createMapgenParams() = 0;
 };
 
-class EmergeManager {
-public:
-       std::map<std::string, MapgenFactory *> mglist;
-
-       //settings
-       MapgenParams *params;
-
-       //mapgen objects here
-       Mapgen *mapgen;
-
-       //biome manager
-       BiomeDefManager *biomedef;
-
-       EmergeManager(IGameDef *gamedef, BiomeDefManager *bdef);
-       ~EmergeManager();
-
-       void initMapgens(MapgenParams *mgparams);
-       Mapgen *createMapgen(std::string mgname, int mgid,
-                                               MapgenParams *mgparams, EmergeManager *emerge);
-       MapgenParams *createMapgenParams(std::string mgname);
-       Mapgen *getMapgen();
-       void addBlockToQueue();
-       
-       void registerMapgen(std::string name, MapgenFactory *mgfactory);
-       MapgenParams *getParamsFromSettings(Settings *settings);
-       void setParamsToSettings(Settings *settings);
-       
-       //mapgen helper methods
-       Biome *getBiomeAtPoint(v3s16 p);
-       int getGroundLevelAtPoint(v2s16 p);
-       bool isBlockUnderground(v3s16 blockpos);
-       u32 getBlockSeed(v3s16 p);
-};
-
 #endif