From 497ff1ecd64c8908f988e15ca879824f2781e3fd Mon Sep 17 00:00:00 2001
From: PilzAdam <PilzAdam@gmx.de>
Date: Sun, 24 Feb 2013 18:40:43 +0100
Subject: Change Minetest-c55 to Minetest

---
 src/mapgen.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mapgen.h')

diff --git a/src/mapgen.h b/src/mapgen.h
index 4f1ab4ebd..13d17bd58 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -1,5 +1,5 @@
 /*
-Minetest-c55
+Minetest
 Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-- 
cgit v1.2.3


From 6d0ea26c2d62c3774ff384cf1bfc2a3372b49a3b Mon Sep 17 00:00:00 2001
From: Sfan5 <sfan5@live.de>
Date: Sun, 24 Feb 2013 19:38:45 +0100
Subject: Update Copyright Years

---
 src/mapgen.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mapgen.h')

diff --git a/src/mapgen.h b/src/mapgen.h
index 13d17bd58..765ac3bb2 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+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
-- 
cgit v1.2.3


From b9d8e59bbf727fcc1a073bbf27e5d1703b9490ef Mon Sep 17 00:00:00 2001
From: kwolekr <mirrorisim@gmail.com>
Date: Wed, 13 Feb 2013 22:43:15 -0500
Subject: Add emerge.cpp, initial EmergeThread changes

- Neatly placed all emerge related code into a new file, emerge.cpp
- Greatly cleaned up the code in EmergeThread::Thread()
- Reworked Emerge queue.  Now an actual std::queue of v3s16 block positions
- Removed the completely unnecessary map of peer ids requesting blocks
---
 src/mapgen.h | 52 ++++------------------------------------------------
 1 file changed, 4 insertions(+), 48 deletions(-)

(limited to 'src/mapgen.h')

diff --git a/src/mapgen.h b/src/mapgen.h
index 765ac3bb2..c3c209ad1 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapnode.h"
 #include "noise.h"
 #include "settings.h"
+//#include "emerge.h"
 #include <map>
 
 /////////////////// Mapgen flags
@@ -36,6 +37,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 +46,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 +89,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
 
-- 
cgit v1.2.3


From 3b7a445cd78c6b5ab301b5bf44e1ec54a00427f1 Mon Sep 17 00:00:00 2001
From: kwolekr <mirrorisim@gmail.com>
Date: Thu, 14 Feb 2013 18:32:56 -0500
Subject: Add global and per-peer queue limits

---
 src/mapgen.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/mapgen.h')

diff --git a/src/mapgen.h b/src/mapgen.h
index c3c209ad1..911e87537 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -26,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapnode.h"
 #include "noise.h"
 #include "settings.h"
-//#include "emerge.h"
 #include <map>
 
 /////////////////// Mapgen flags
-- 
cgit v1.2.3