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 f848389a8491a97d59292d8c2788f16786c84567..911e87537cc3ac5d7bd3071487216762c73122c8 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -1,18 +1,18 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,50 +20,73 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPGEN_HEADER
 #define MAPGEN_HEADER
 
-#include "common_irrlicht.h"
-#include "utility.h" // UniqueQueue
+#include "irrlichttypes_extrabloated.h"
+#include "util/container.h" // UniqueQueue
+#include "gamedef.h"
+#include "mapnode.h"
+#include "noise.h"
+#include "settings.h"
+#include <map>
 
-struct BlockMakeData;
+/////////////////// Mapgen flags
+#define MG_TREES         0x01
+#define MG_CAVES         0x02
+#define MG_DUNGEONS      0x04
+#define MGV6_FORESTS     0x08
+#define MGV6_BIOME_BLEND 0x10
+#define MG_FLAT          0x20
+
+extern FlagDesc flagdesc_mapgen[];
+
+class BiomeDefManager;
+class Biome;
+class EmergeManager;
 class MapBlock;
 class ManualMapVoxelManipulator;
+class VoxelManipulator;
+class INodeDefManager;
+class BlockMakeData;
 
-namespace mapgen
-{
-       // Finds precise ground level at any position
-       s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision);
-
-       // Find out if block is completely underground
-       bool block_is_underground(u64 seed, v3s16 blockpos);
+struct MapgenParams {
+       std::string mg_name;
+       int chunksize;
+       u64 seed;
+       int water_level;
+       u32 flags;
 
-       // Main map generation routine
-       void make_block(BlockMakeData *data);
+       MapgenParams() {
+               mg_name     = "v6";
+               seed        = 0;
+               water_level = 1;
+               chunksize   = 5;
+               flags       = MG_TREES | MG_CAVES | MGV6_BIOME_BLEND;
+       }
        
-       // Add objects according to block content
-       void add_random_objects(MapBlock *block);
+       virtual bool readParams(Settings *settings) = 0;
+       virtual void writeParams(Settings *settings) {};
+};
 
-       // Add a tree
-       void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0, bool is_apple_tree);
-       
-       /*
-               These are used by FarMesh
-       */
-       bool get_have_sand(u64 seed, v2s16 p2d);
-       double tree_amount_2d(u64 seed, v2s16 p);
-       
+class Mapgen {
+public:
+       int seed;
+       int water_level;
+       bool generating;
+       int id;
 
-       struct BlockMakeData
-       {
-               bool no_op;
-               ManualMapVoxelManipulator *vmanip;
-               u64 seed;
-               v3s16 blockpos;
-               UniqueQueue<v3s16> transforming_liquid;
+       virtual void makeChunk(BlockMakeData *data) {};
+       virtual int getGroundLevelAtPoint(v2s16 p) = 0;
 
-               BlockMakeData();
-               ~BlockMakeData();
-       };
+       //Legacy functions for Farmesh (pending removal)
+       static bool get_have_beach(u64 seed, v2s16 p2d);
+       static double tree_amount_2d(u64 seed, v2s16 p);
+       static s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision);
+};
 
-}; // namespace mapgen
+struct MapgenFactory {
+       virtual Mapgen *createMapgen(int mgid, MapgenParams *params,
+                                                                EmergeManager *emerge) = 0;
+       virtual MapgenParams *createMapgenParams() = 0;
+};
 
 #endif