summaryrefslogtreecommitdiff
path: root/src/mapgen_v6.cpp
diff options
context:
space:
mode:
authorkwolekr <mirrorisim@gmail.com>2013-02-13 22:43:15 -0500
committerkwolekr <mirrorisim@gmail.com>2013-02-25 22:56:18 -0500
commitb9d8e59bbf727fcc1a073bbf27e5d1703b9490ef (patch)
tree629dba18aab743e66b88858f5385cf4ba36d0328 /src/mapgen_v6.cpp
parent6d0ea26c2d62c3774ff384cf1bfc2a3372b49a3b (diff)
downloadminetest-b9d8e59bbf727fcc1a073bbf27e5d1703b9490ef.tar.gz
minetest-b9d8e59bbf727fcc1a073bbf27e5d1703b9490ef.tar.bz2
minetest-b9d8e59bbf727fcc1a073bbf27e5d1703b9490ef.zip
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
Diffstat (limited to 'src/mapgen_v6.cpp')
-rw-r--r--src/mapgen_v6.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index dd4452928..ef2cf5f52 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "profiler.h"
#include "settings.h" // For g_settings
#include "main.h" // For g_profiler
+#include "emerge.h"
#include "mapgen_v6.h"
/////////////////// Mapgen V6 perlin noise default values